bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Michael Vogel 2013-06-08 12:30:36 +02:00
commit 323186864e
111 changed files with 19975 additions and 26166 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/editpost.php
View file

@ -133,7 +133,7 @@ function editpost_content(&$a) {
'$emailcc' => t('CC: email addresses'),
'$public' => t('Public post'),
'$jotnets' => $jotnets,
'$title' => $itm[0]['title'],
'$title' => htmlspecialchars($itm[0]['title']),
'$placeholdertitle' => t('Set title'),
'$category' => file_tag_file_to_list($itm[0]['file'], 'category'),
'$placeholdercategory' => (feature_enabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''),

2
mod/install.php
View file

@ -114,7 +114,7 @@ function install_content(&$a) {
global $install_wizard_pass, $db;
$o = '';
$wizard_status = "";
$install_title = t('Friendica Social Communications Server - Setup');
$install_title = t('Friendica Communications Server - Setup');

2
mod/uimport.php
View file

@ -67,7 +67,7 @@ function uimport_content(&$a) {
'intro' => t("You can import an account from another Friendica server."),
'instruct' => t("You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."),
'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"),
'field' => array('accountfile', t('Account file'),'<input id="id_accountfile" name="accountfile" type="file">', t('To export your accont, go to "Settings->Export your porsonal data" and select "Export account"')),
'field' => array('accountfile', t('Account file'),'<input id="id_accountfile" name="accountfile" type="file">', t('To export your account, go to "Settings->Export your personal data" and select "Export account"')),
),
));
}