mirror of https://github.com/friendica/friendica
Merge remote-tracking branch 'upstream/2021.06-rc' into profile-publish
This commit is contained in:
commit
1ced04e54c
|
|
@ -13,44 +13,21 @@ Authentication is the same as described in [Using the APIs](help/api#Authenticat
|
|||
|
||||
### Supported apps
|
||||
|
||||
#### Android
|
||||
|
||||
- [AndStatus](http://andstatus.org)
|
||||
- [B4X for Pleroma & Mastodon](https://github.com/AnywhereSoftware/B4X-Pleroma)
|
||||
- [Fedi](https://play.google.com/store/apps/details?id=com.fediverse.app)
|
||||
- [Husky](https://husky.fwgs.ru)
|
||||
- [Roma](https://play.google.com/store/apps/details?id=tech.bigfig.roma)
|
||||
- [Subway Tooter](https://github.com/tateisu/SubwayTooter)
|
||||
- [Tooot](https://tooot.app/)
|
||||
- [Tusky](https://tusky.app)
|
||||
- [Twidere](https://github.com/TwidereProject/)
|
||||
- [twitlatte](https://github.com/moko256/twitlatte)
|
||||
- [Yuito](https://github.com/accelforce/Yuito)
|
||||
|
||||
#### iOS
|
||||
- [Amaroq](https://github.com/ReticentJohn/Amaroq/tree/master)
|
||||
- [B4X for Pleroma & Mastodon](https://github.com/AnywhereSoftware/B4X-Pleroma)
|
||||
- [Fedi](https://apps.apple.com/de/app/fedi-for-pleroma-and-mastodon/id1478806281)
|
||||
- [Roma](https://apps.apple.com/de/app/roma-for-pleroma-and-mastodon/id1445328699)
|
||||
- [StarPterano](https://apps.apple.com/de/app/starpterano/id1436972796) Uses an OAuth method where you have to manually copy and paste the provided code.
|
||||
- [Stella](https://apps.apple.com/us/app/stella-for-mastodon-twitter/id921372048?l=ms)
|
||||
- [Tooot](https://tooot.app/)
|
||||
- [Tootle](https://apps.apple.com/de/app/tootle-for-mastodon/id1236013466) entered hostname must match in upper/lower case. Currently crashes on "Status" type notifications.
|
||||
|
||||
#### Desktop
|
||||
- [Whalebird](https://whalebird.social)
|
||||
For supported apps please have a look at the [FAQ](help/FAQ#clients)
|
||||
|
||||
### Unsupported apps
|
||||
|
||||
#### Android
|
||||
|
||||
- [Fedilab](https://framagit.org/tom79/fedilab) Automatically uses the legacy API, see issue: https://framagit.org/tom79/fedilab/-/issues/520
|
||||
- [Mammut](https://github.com/jamiesanson/Mammut) There are problems with the token request, see issue https://github.com/jamiesanson/Mammut/issues/19
|
||||
|
||||
#### iOS
|
||||
|
||||
- [Mast](https://github.com/Beesitech/Mast) Doesn't accept the entered instance name. Claims that it is invalid (Message is: "Not a valid instance (may be closed or dead)")
|
||||
- [Toot!](https://apps.apple.com/app/toot/id1229021451)
|
||||
|
||||
#### Other
|
||||
#### Desktop
|
||||
|
||||
- [Halycon](https://www.halcyon.social/) Doesn't load content, creates masses of HTTP requests
|
||||
- [Mastonaut](https://mastonaut.app/)
|
||||
|
|
|
|||
61
doc/FAQ.md
61
doc/FAQ.md
|
|
@ -183,25 +183,52 @@ Example: Friendica Support
|
|||
### What friendica clients can I use?
|
||||
|
||||
Friendica is using a [Twitter/GNU Social compatible API](help/api), which means you can use any Twitter/GNU Social client for your platform as long as you can change the API path in its settings.
|
||||
Since the 2021.06 release, Friendica also supports the Mastodon API.
|
||||
Since the 2021.06 release, Friendica also supports the [Mastodon API](help/API-Mastodon) which works with many Mastodon clients.
|
||||
Here is a list of known working clients:
|
||||
|
||||
* Android
|
||||
* [Friendiqa](https://git.friendi.ca/lubuwest/Friendiqa) ([F-Droid](https://git.friendi.ca/lubuwest/Friendiqa#install), [Google Play](https://play.google.com/store/apps/details?id=org.qtproject.friendiqa))
|
||||
* [Fedilab](https://fedilab.app) ([F-Droid](https://f-droid.org/app/fr.gouv.etalab.mastodon), [Google Play](https://play.google.com/store/apps/details?id=app.fedilab.android))
|
||||
* [AndStatus](http://andstatus.org) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.andstatus.app), [Google Play](https://play.google.com/store/apps/details?id=org.andstatus.app))
|
||||
* [Twidere](https://dimension.im/) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.mariotaku.twidere), [Google Play](https://play.google.com/store/apps/details?id=com.twidere.twiderex), [GitHub](https://github.com/TwidereProject/Twidere-Android))
|
||||
* SailfishOS
|
||||
* [Friendly](https://openrepos.net/content/fabrixxm/friendly#comment-form)
|
||||
* Linux
|
||||
* [Choqok](https://choqok.kde.org)
|
||||
* Windows
|
||||
* [Friendica Mobile](https://www.microsoft.com/de-DE/store/p/friendica-mobile/9nblggh0fhmn?rtc=1) (Windows 10)
|
||||
* [Husky](https://husky.fwgs.ru)
|
||||
* [Subway Tooter](https://github.com/tateisu/SubwayTooter)
|
||||
* [Tusky](https://tusky.app)
|
||||
* [twitlatte](https://github.com/moko256/twitlatte)
|
||||
* [Yuito](https://github.com/accelforce/Yuito)
|
||||
#### Android
|
||||
|
||||
* [AndStatus](http://andstatus.org) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.andstatus.app), [Google Play](https://play.google.com/store/apps/details?id=org.andstatus.app))
|
||||
* [B4X for Pleroma & Mastodon](https://github.com/AnywhereSoftware/B4X-Pleroma)
|
||||
* [DiCa](https://dica.mixi.cool/) (Available at Google Play)
|
||||
* [Fedi](https://play.google.com/store/apps/details?id=com.fediverse.app)
|
||||
* [Fedilab](https://fedilab.app) ([F-Droid](https://f-droid.org/app/fr.gouv.etalab.mastodon), [Google Play](https://play.google.com/store/apps/details?id=app.fedilab.android))
|
||||
* [Friendiqa](https://git.friendi.ca/lubuwest/Friendiqa) ([F-Droid](https://git.friendi.ca/lubuwest/Friendiqa#install), [Google Play](https://play.google.com/store/apps/details?id=org.qtproject.friendiqa))
|
||||
* [Husky](https://husky.fwgs.ru)
|
||||
* [Roma](https://play.google.com/store/apps/details?id=tech.bigfig.roma)
|
||||
* [Subway Tooter](https://github.com/tateisu/SubwayTooter)
|
||||
* [Tooot](https://tooot.app/)
|
||||
* [Tusky](https://tusky.app)
|
||||
* [Twidere](https://dimension.im/) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.mariotaku.twidere), [Google Play](https://play.google.com/store/apps/details?id=com.twidere.twiderex), [GitHub](https://github.com/TwidereProject/Twidere-Android))
|
||||
* [twitlatte](https://github.com/moko256/twitlatte)
|
||||
* [Yuito](https://github.com/accelforce/Yuito)
|
||||
|
||||
#### SailfishOS
|
||||
|
||||
* [Friendly](https://openrepos.net/content/fabrixxm/friendly#comment-form)
|
||||
|
||||
#### iOS
|
||||
|
||||
* [Amaroq](https://github.com/ReticentJohn/Amaroq/tree/master)
|
||||
* [B4X for Pleroma & Mastodon](https://github.com/AnywhereSoftware/B4X-Pleroma)
|
||||
* [Fedi](https://apps.apple.com/de/app/fedi-for-pleroma-and-mastodon/id1478806281)
|
||||
* [Roma](https://apps.apple.com/de/app/roma-for-pleroma-and-mastodon/id1445328699)
|
||||
* [StarPterano](https://apps.apple.com/de/app/starpterano/id1436972796) Uses an OAuth method where you have to manually copy and paste the provided code.
|
||||
* [Stella](https://apps.apple.com/us/app/stella-for-mastodon-twitter/id921372048?l=ms)
|
||||
* [Tooot](https://tooot.app/)
|
||||
* [Tootle](https://apps.apple.com/de/app/tootle-for-mastodon/id1236013466) entered hostname must match in upper/lower case. Currently crashes on "Status" type notifications.
|
||||
|
||||
#### Linux
|
||||
|
||||
* [Choqok](https://choqok.kde.org)
|
||||
* [Whalebird](https://whalebird.social)
|
||||
* [TheDesk](https://ja.mstdn.wiki/TheDesk)
|
||||
* [Toot](https://toot.readthedocs.io/en/latest/)
|
||||
* [Tootle](https://github.com/bleakgrey/tootle)
|
||||
|
||||
#### Windows
|
||||
|
||||
* [Friendica Mobile](https://www.microsoft.com/de-DE/store/p/friendica-mobile/9nblggh0fhmn?rtc=1) (Windows 10)
|
||||
|
||||
Depending on the features of the client you might encounter some glitches in usability, like being limited in the length of your postings to 140 characters and having no access to the [permission settings](help/Groups-and-Privacy).
|
||||
|
||||
|
|
|
|||
|
|
@ -193,33 +193,54 @@ Beispiel: Friendica Support
|
|||
### Gibt es Clients für Friendica?
|
||||
|
||||
Friendica verwendet eine [Twitter/GNU Social](help/api) kompatible API.
|
||||
Seit der Version 2021.06 unterstützt Friendica außerdem die Mastodon API.
|
||||
Das bedeutet, dass du jeden Twitter/GNU Social Client verwenden kannst in dem du den API Pfad entsprechend änderst.
|
||||
Seit der Version 2021.06 unterstützt Friendica außerdem die [Mastodon API](help/API-Mastodon) die mit vielen Mastodon-Clients läuft.
|
||||
|
||||
Hier ist eine Liste von Clients bei denen dies möglich ist, bzw. die speziell für Friendica entwickelt werden:
|
||||
Hier ist eine Liste von Clients, die speziell für Friendica entwickelt werden oder die mit Friendica kompatibel sind:
|
||||
|
||||
* Android
|
||||
* [Friendiqa](https://git.friendi.ca/lubuwest/Friendiqa) (Gibt es im Google Playstore oder als [binary Repository](https://freunde.ma-nic.de/display/3e98eba8185a13c5bdbf3d1539646854) für F-Droid)
|
||||
* [Fedilab](https://gitlab.com/tom79/mastalab) (Gibt es im F-Droid und dem Google Play Store)
|
||||
* [DiCa](https://dica.mixi.cool/) (Gibt es bei Google Play)
|
||||
* AndStatus
|
||||
* Twidere
|
||||
* Mustard and Mustard-Mod
|
||||
* SailfishOS
|
||||
* [Friendly](https://openrepos.net/content/fabrixxm/friendly#comment-form)
|
||||
* [Husky](https://husky.fwgs.ru)
|
||||
* [Subway Tooter](https://github.com/tateisu/SubwayTooter)
|
||||
* [Tusky](https://tusky.app)
|
||||
* [twitlatte](https://github.com/moko256/twitlatte)
|
||||
* [Yuito](https://github.com/accelforce/Yuito)
|
||||
* Linux
|
||||
* Hotot
|
||||
* Choqok
|
||||
* MacOS X
|
||||
* Hotot
|
||||
* Windows
|
||||
* [Friendica Mobile](https://www.microsoft.com/de-DE/store/p/friendica-mobile/9nblggh0fhmn?rtc=1) für Windows 10
|
||||
* Hotot
|
||||
#### Android
|
||||
|
||||
* [AndStatus](http://andstatus.org) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.andstatus.app), [Google Play](https://play.google.com/store/apps/details?id=org.andstatus.app))
|
||||
* [B4X for Pleroma & Mastodon](https://github.com/AnywhereSoftware/B4X-Pleroma)
|
||||
* [DiCa](https://dica.mixi.cool/) (Gibt es bei Google Play)
|
||||
* [Fedi](https://play.google.com/store/apps/details?id=com.fediverse.app)
|
||||
* [Fedilab](https://fedilab.app) ([F-Droid](https://f-droid.org/app/fr.gouv.etalab.mastodon), [Google Play](https://play.google.com/store/apps/details?id=app.fedilab.android))
|
||||
* [Friendiqa](https://git.friendi.ca/lubuwest/Friendiqa) (Gibt es im Google Playstore oder als [binary Repository](https://freunde.ma-nic.de/display/3e98eba8185a13c5bdbf3d1539646854) für F-Droid)
|
||||
* [Husky](https://husky.fwgs.ru)
|
||||
* [Roma](https://play.google.com/store/apps/details?id=tech.bigfig.roma)
|
||||
* [Subway Tooter](https://github.com/tateisu/SubwayTooter)
|
||||
* [Tooot](https://tooot.app/)
|
||||
* [Tusky](https://tusky.app)
|
||||
* [Twidere](https://dimension.im/) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.mariotaku.twidere), [Google Play](https://play.google.com/store/apps/details?id=com.twidere.twiderex), [GitHub](https://github.com/TwidereProject/Twidere-Android))
|
||||
* [twitlatte](https://github.com/moko256/twitlatte)
|
||||
* [Yuito](https://github.com/accelforce/Yuito)
|
||||
|
||||
#### SailfishOS
|
||||
|
||||
* [Friendly](https://openrepos.net/content/fabrixxm/friendly#comment-form)
|
||||
|
||||
#### iOS
|
||||
|
||||
- [Amaroq](https://github.com/ReticentJohn/Amaroq/tree/master)
|
||||
- [B4X for Pleroma & Mastodon](https://github.com/AnywhereSoftware/B4X-Pleroma)
|
||||
- [Fedi](https://apps.apple.com/de/app/fedi-for-pleroma-and-mastodon/id1478806281)
|
||||
- [Roma](https://apps.apple.com/de/app/roma-for-pleroma-and-mastodon/id1445328699)
|
||||
- [StarPterano](https://apps.apple.com/de/app/starpterano/id1436972796)
|
||||
- [Stella](https://apps.apple.com/us/app/stella-for-mastodon-twitter/id921372048?l=ms)
|
||||
- [Tooot](https://tooot.app/)
|
||||
- [Tootle](https://apps.apple.com/de/app/tootle-for-mastodon/id1236013466) Der eingegene Hostname muss in Groß-/Kleinschreibung mit dem Hostnamen des Systems übereinstimmen. Die aktuelle Version stürzt bei Benachrichtungen bom Typ "status" ab.
|
||||
|
||||
#### Linux
|
||||
|
||||
* [Choqok](https://choqok.kde.org)
|
||||
* [Whalebird](https://whalebird.social)
|
||||
* [TheDesk](https://ja.mstdn.wiki/TheDesk)
|
||||
* [Toot](https://toot.readthedocs.io/en/latest/)
|
||||
* [Tootle](https://github.com/bleakgrey/tootle)
|
||||
|
||||
#### Windows
|
||||
|
||||
* [Friendica Mobile](https://www.microsoft.com/de-DE/store/p/friendica-mobile/9nblggh0fhmn?rtc=1) für Windows 10
|
||||
|
||||
Admin
|
||||
--------
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ Friendica - Dokumentation und Ressourcen
|
|||
* [Class Autoloading](help/autoloader) (EN)
|
||||
* [Using Composer](help/Composer) (EN)
|
||||
* [Code-Referenz (mit doxygen generiert - setzt Cookies)](doc/html/)
|
||||
* [Twitter/GNU Social API Functions](help/api) (EN)
|
||||
* [API Dokumentation](help/api) (EN)
|
||||
* [Translation of Friendica](help/translations) (EN)
|
||||
* [Run tests](help/Tests) (EN)
|
||||
|
||||
|
|
|
|||
|
|
@ -66,54 +66,27 @@ function match_content(App $a)
|
|||
$params = [];
|
||||
$tags = trim($profile['pub_keywords'] . ' ' . $profile['prv_keywords']);
|
||||
|
||||
if (DI::mode()->isMobile()) {
|
||||
$limit = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
|
||||
DI::config()->get('system', 'itemspage_network_mobile'));
|
||||
} else {
|
||||
$limit = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
|
||||
DI::config()->get('system', 'itemspage_network'));
|
||||
}
|
||||
|
||||
$params['s'] = $tags;
|
||||
$params['n'] = 100;
|
||||
|
||||
if (strlen(DI::config()->get('system', 'directory'))) {
|
||||
$host = Search::getGlobalDirectory();
|
||||
} else {
|
||||
$host = DI::baseUrl();
|
||||
}
|
||||
|
||||
$msearch_json = DI::httpRequest()->post($host . '/msearch', $params)->getBody();
|
||||
|
||||
$msearch = json_decode($msearch_json);
|
||||
|
||||
$start = $_GET['start'] ?? 0;
|
||||
$entries = [];
|
||||
$paginate = '';
|
||||
|
||||
if (!empty($msearch->results)) {
|
||||
for ($i = $start;count($entries) < 10 && $i < $msearch->total; $i++) {
|
||||
$profile = $msearch->results[$i];
|
||||
|
||||
// Already known contact
|
||||
if (!$profile || Contact::getIdForURL($profile->url, local_user())) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$contact = Contact::getByURLForUser($profile->url, local_user());
|
||||
if (!empty($contact)) {
|
||||
$entries[] = ModuleContact::getContactTemplateVars($contact);
|
||||
}
|
||||
foreach ([Search::getGlobalDirectory(), DI::baseUrl()] as $server) {
|
||||
if (empty($server)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$data = [
|
||||
'class' => 'pager',
|
||||
'first' => [
|
||||
'url' => 'match',
|
||||
'text' => DI::l10n()->t('first'),
|
||||
'class' => 'previous' . ($start == 0 ? 'disabled' : '')
|
||||
],
|
||||
'next' => [
|
||||
'url' => 'match?start=' . $i,
|
||||
'text' => DI::l10n()->t('next'),
|
||||
'class' => 'next' . ($i >= $msearch->total ? ' disabled' : '')
|
||||
]
|
||||
];
|
||||
|
||||
$tpl = Renderer::getMarkupTemplate('paginate.tpl');
|
||||
$paginate = Renderer::replaceMacros($tpl, ['pager' => $data]);
|
||||
$msearch = json_decode(DI::httpRequest()->post($server . '/msearch', $params)->getBody());
|
||||
if (!empty($msearch)) {
|
||||
$entries = match_get_contacts($msearch, $entries, $limit);
|
||||
}
|
||||
}
|
||||
|
||||
if (empty($entries)) {
|
||||
|
|
@ -123,9 +96,37 @@ function match_content(App $a)
|
|||
$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
|
||||
$o = Renderer::replaceMacros($tpl, [
|
||||
'$title' => DI::l10n()->t('Profile Match'),
|
||||
'$contacts' => $entries,
|
||||
'$paginate' => $paginate
|
||||
'$contacts' => array_slice($entries, 0, $limit),
|
||||
]);
|
||||
|
||||
return $o;
|
||||
}
|
||||
|
||||
function match_get_contacts($msearch, $entries, $limit)
|
||||
{
|
||||
if (empty($msearch->results)) {
|
||||
return $entries;
|
||||
}
|
||||
|
||||
foreach ($msearch->results as $profile) {
|
||||
if (!$profile) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Already known contact
|
||||
$contact = Contact::getByURL($profile->url, null, ['rel'], local_user());
|
||||
if (!empty($contact) && in_array($contact['rel'], [Contact::FRIEND, Contact::SHARING])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$contact = Contact::getByURLForUser($profile->url, local_user());
|
||||
if (!empty($contact)) {
|
||||
$entries[$contact['id']] = ModuleContact::getContactTemplateVars($contact);
|
||||
}
|
||||
|
||||
if (count($entries) == $limit) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return $entries;
|
||||
}
|
||||
|
|
@ -586,10 +586,10 @@ class Event
|
|||
$last_date = '';
|
||||
$fmt = DI::l10n()->t('l, F j');
|
||||
foreach ($event_result as $event) {
|
||||
$item = Post::selectFirst(['plink', 'author-name', 'author-avatar', 'author-link'], ['id' => $event['itemid']]);
|
||||
$item = Post::selectFirst(['plink', 'author-name', 'author-avatar', 'author-link', 'private'], ['id' => $event['itemid']]);
|
||||
if (!DBA::isResult($item)) {
|
||||
// Using default values when no item had been found
|
||||
$item = ['plink' => '', 'author-name' => '', 'author-avatar' => '', 'author-link' => ''];
|
||||
$item = ['plink' => '', 'author-name' => '', 'author-avatar' => '', 'author-link' => '', 'private' => Item::PUBLIC];
|
||||
}
|
||||
|
||||
$event = array_merge($event, $item);
|
||||
|
|
|
|||
|
|
@ -391,7 +391,12 @@ class User
|
|||
if (!DBA::exists('user', ['uid' => $uid]) || !$repairMissing) {
|
||||
return false;
|
||||
}
|
||||
Contact::createSelfFromUserId($uid);
|
||||
if (!DBA::exists('profile', ['uid' => $uid])) {
|
||||
DBA::insert('profile', ['uid' => $uid]);
|
||||
}
|
||||
if (!DBA::exists('contact', ['uid' => $uid, 'self' => true])) {
|
||||
Contact::createSelfFromUserId($uid);
|
||||
}
|
||||
$owner = self::getOwnerDataById($uid, false);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: 2021.06-rc\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-13 11:02+0000\n"
|
||||
"POT-Creation-Date: 2021-06-15 17:22+0000\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"
|
||||
|
|
@ -1599,19 +1599,11 @@ msgstr ""
|
|||
msgid "No keywords to match. Please add keywords to your profile."
|
||||
msgstr ""
|
||||
|
||||
#: mod/match.php:105 src/Content/Pager.php:216
|
||||
msgid "first"
|
||||
msgstr ""
|
||||
|
||||
#: mod/match.php:110 src/Content/Pager.php:276
|
||||
msgid "next"
|
||||
msgstr ""
|
||||
|
||||
#: mod/match.php:120 src/Module/BaseSearch.php:117
|
||||
#: mod/match.php:93 src/Module/BaseSearch.php:117
|
||||
msgid "No matches"
|
||||
msgstr ""
|
||||
|
||||
#: mod/match.php:125
|
||||
#: mod/match.php:98
|
||||
msgid "Profile Match"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3626,10 +3618,18 @@ msgstr ""
|
|||
msgid "Embedded content"
|
||||
msgstr ""
|
||||
|
||||
#: src/Content/Pager.php:216
|
||||
msgid "first"
|
||||
msgstr ""
|
||||
|
||||
#: src/Content/Pager.php:221
|
||||
msgid "prev"
|
||||
msgstr ""
|
||||
|
||||
#: src/Content/Pager.php:276
|
||||
msgid "next"
|
||||
msgstr ""
|
||||
|
||||
#: src/Content/Pager.php:281
|
||||
msgid "last"
|
||||
msgstr ""
|
||||
|
|
@ -4489,33 +4489,33 @@ msgstr ""
|
|||
msgid "Done. You can now login with your username and password"
|
||||
msgstr ""
|
||||
|
||||
#: src/Database/DBStructure.php:64
|
||||
#: src/Database/DBStructure.php:65
|
||||
#, php-format
|
||||
msgid "The database version had been set to %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/Database/DBStructure.php:77
|
||||
#: src/Database/DBStructure.php:78
|
||||
#, php-format
|
||||
msgid ""
|
||||
"The post update is at version %d, it has to be at %d to safely drop the "
|
||||
"tables."
|
||||
msgstr ""
|
||||
|
||||
#: src/Database/DBStructure.php:89
|
||||
#: src/Database/DBStructure.php:90
|
||||
msgid "No unused tables found."
|
||||
msgstr ""
|
||||
|
||||
#: src/Database/DBStructure.php:94
|
||||
#: src/Database/DBStructure.php:95
|
||||
msgid ""
|
||||
"These tables are not used for friendica and will be deleted when you execute "
|
||||
"\"dbstructure drop -e\":"
|
||||
msgstr ""
|
||||
|
||||
#: src/Database/DBStructure.php:132
|
||||
#: src/Database/DBStructure.php:133
|
||||
msgid "There are no tables on MyISAM or InnoDB with the Antelope file format."
|
||||
msgstr ""
|
||||
|
||||
#: src/Database/DBStructure.php:156
|
||||
#: src/Database/DBStructure.php:157
|
||||
#, php-format
|
||||
msgid ""
|
||||
"\n"
|
||||
|
|
@ -4523,20 +4523,20 @@ msgid ""
|
|||
"%s\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/Database/DBStructure.php:159
|
||||
#: src/Database/DBStructure.php:160
|
||||
msgid "Errors encountered performing database changes: "
|
||||
msgstr ""
|
||||
|
||||
#: src/Database/DBStructure.php:445
|
||||
#: src/Database/DBStructure.php:550
|
||||
msgid "Another database update is currently running."
|
||||
msgstr ""
|
||||
|
||||
#: src/Database/DBStructure.php:449
|
||||
#: src/Database/DBStructure.php:554
|
||||
#, php-format
|
||||
msgid "%s: Database update"
|
||||
msgstr ""
|
||||
|
||||
#: src/Database/DBStructure.php:749
|
||||
#: src/Database/DBStructure.php:854
|
||||
#, php-format
|
||||
msgid "%s: updating %s table."
|
||||
msgstr ""
|
||||
|
|
|
|||
Loading…
Reference in New Issue