clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/2021.06-rc' into profile-publish

This commit is contained in:
Michael 2021-06-16 05:01:16 +00:00
parent 0ab24510ef 9039d812f1
commit 1ced04e54c
8 changed files with 168 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
doc/API-Mastodon.md
View File

@ -13,44 +13,21 @@ Authentication is the same as described in [Using the APIs](help/api#Authenticat
### Supported apps ### Supported apps
#### Android For supported apps please have a look at the [FAQ](help/FAQ#clients)
- [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)
### Unsupported apps ### Unsupported apps
#### Android #### Android
- [Fedilab](https://framagit.org/tom79/fedilab) Automatically uses the legacy API, see issue: https://framagit.org/tom79/fedilab/-/issues/520 - [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 - [Mammut](https://github.com/jamiesanson/Mammut) There are problems with the token request, see issue https://github.com/jamiesanson/Mammut/issues/19
#### iOS #### 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)") - [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) - [Toot!](https://apps.apple.com/app/toot/id1229021451)
#### Other #### Desktop
- [Halycon](https://www.halcyon.social/) Doesn't load content, creates masses of HTTP requests - [Halycon](https://www.halcyon.social/) Doesn't load content, creates masses of HTTP requests
- [Mastonaut](https://mastonaut.app/) - [Mastonaut](https://mastonaut.app/)

61
doc/FAQ.md
View File

@ -183,25 +183,52 @@ Example: Friendica Support
### What friendica clients can I use? ### 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. 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: Here is a list of known working clients:
* Android #### 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))
* [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)
* [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)) * [DiCa](https://dica.mixi.cool/) (Available at Google Play)
* SailfishOS * [Fedi](https://play.google.com/store/apps/details?id=com.fediverse.app)
* [Friendly](https://openrepos.net/content/fabrixxm/friendly#comment-form) * [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))
* Linux * [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))
* [Choqok](https://choqok.kde.org) * [Husky](https://husky.fwgs.ru)
* Windows * [Roma](https://play.google.com/store/apps/details?id=tech.bigfig.roma)
* [Friendica Mobile](https://www.microsoft.com/de-DE/store/p/friendica-mobile/9nblggh0fhmn?rtc=1) (Windows 10) * [Subway Tooter](https://github.com/tateisu/SubwayTooter)
* [Husky](https://husky.fwgs.ru) * [Tooot](https://tooot.app/)
* [Subway Tooter](https://github.com/tateisu/SubwayTooter) * [Tusky](https://tusky.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) * [twitlatte](https://github.com/moko256/twitlatte)
* [Yuito](https://github.com/accelforce/Yuito) * [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). 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).

69
doc/de/FAQ.md
View File

@ -193,33 +193,54 @@ Beispiel: Friendica Support
### Gibt es Clients für Friendica? ### Gibt es Clients für Friendica?
Friendica verwendet eine [Twitter/GNU Social](help/api) kompatible API. 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. 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 #### 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) * [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))
* [DiCa](https://dica.mixi.cool/) (Gibt es bei Google Play) * [B4X for Pleroma & Mastodon](https://github.com/AnywhereSoftware/B4X-Pleroma)
* AndStatus * [DiCa](https://dica.mixi.cool/) (Gibt es bei Google Play)
* Twidere * [Fedi](https://play.google.com/store/apps/details?id=com.fediverse.app)
* Mustard and Mustard-Mod * [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))
* SailfishOS * [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)
* [Friendly](https://openrepos.net/content/fabrixxm/friendly#comment-form) * [Husky](https://husky.fwgs.ru)
* [Husky](https://husky.fwgs.ru) * [Roma](https://play.google.com/store/apps/details?id=tech.bigfig.roma)
* [Subway Tooter](https://github.com/tateisu/SubwayTooter) * [Subway Tooter](https://github.com/tateisu/SubwayTooter)
* [Tusky](https://tusky.app) * [Tooot](https://tooot.app/)
* [twitlatte](https://github.com/moko256/twitlatte) * [Tusky](https://tusky.app)
* [Yuito](https://github.com/accelforce/Yuito) * [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))
* Linux * [twitlatte](https://github.com/moko256/twitlatte)
* Hotot * [Yuito](https://github.com/accelforce/Yuito)
* Choqok
* MacOS X #### SailfishOS
* Hotot
* Windows * [Friendly](https://openrepos.net/content/fabrixxm/friendly#comment-form)
* [Friendica Mobile](https://www.microsoft.com/de-DE/store/p/friendica-mobile/9nblggh0fhmn?rtc=1) für Windows 10
* Hotot #### 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 Admin
-------- --------

2
doc/de/Home.md
View File

@ -54,7 +54,7 @@ Friendica - Dokumentation und Ressourcen
* [Class Autoloading](help/autoloader) (EN) * [Class Autoloading](help/autoloader) (EN)
* [Using Composer](help/Composer) (EN) * [Using Composer](help/Composer) (EN)
* [Code-Referenz (mit doxygen generiert - setzt Cookies)](doc/html/) * [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) * [Translation of Friendica](help/translations) (EN)
* [Run tests](help/Tests) (EN) * [Run tests](help/Tests) (EN)

85
mod/match.php
View File

@ -66,56 +66,29 @@ function match_content(App $a)
$params = []; $params = [];
$tags = trim($profile['pub_keywords'] . ' ' . $profile['prv_keywords']); $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['s'] = $tags;
$params['n'] = 100; $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 = []; $entries = [];
$paginate = ''; foreach ([Search::getGlobalDirectory(), DI::baseUrl()] as $server) {
if (empty($server)) {
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; continue;
} }
$contact = Contact::getByURLForUser($profile->url, local_user()); $msearch = json_decode(DI::httpRequest()->post($server . '/msearch', $params)->getBody());
if (!empty($contact)) { if (!empty($msearch)) {
$entries[] = ModuleContact::getContactTemplateVars($contact); $entries = match_get_contacts($msearch, $entries, $limit);
} }
} }
$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]);
}
if (empty($entries)) { if (empty($entries)) {
info(DI::l10n()->t('No matches')); info(DI::l10n()->t('No matches'));
} }
@ -123,9 +96,37 @@ function match_content(App $a)
$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl'); $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
$o = Renderer::replaceMacros($tpl, [ $o = Renderer::replaceMacros($tpl, [
'$title' => DI::l10n()->t('Profile Match'), '$title' => DI::l10n()->t('Profile Match'),
'$contacts' => $entries, '$contacts' => array_slice($entries, 0, $limit),
'$paginate' => $paginate
]); ]);
return $o; 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;
}

4
src/Model/Event.php
View File

@ -586,10 +586,10 @@ class Event
$last_date = ''; $last_date = '';
$fmt = DI::l10n()->t('l, F j'); $fmt = DI::l10n()->t('l, F j');
foreach ($event_result as $event) { 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)) { if (!DBA::isResult($item)) {
// Using default values when no item had been found // 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); $event = array_merge($event, $item);

5
src/Model/User.php
View File

@ -391,7 +391,12 @@ class User
if (!DBA::exists('user', ['uid' => $uid]) || !$repairMissing) { if (!DBA::exists('user', ['uid' => $uid]) || !$repairMissing) {
return false; return false;
} }
if (!DBA::exists('profile', ['uid' => $uid])) {
DBA::insert('profile', ['uid' => $uid]);
}
if (!DBA::exists('contact', ['uid' => $uid, 'self' => true])) {
Contact::createSelfFromUserId($uid); Contact::createSelfFromUserId($uid);
}
$owner = self::getOwnerDataById($uid, false); $owner = self::getOwnerDataById($uid, false);
} }

42
view/lang/C/messages.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2021.06-rc\n" "Project-Id-Version: 2021.06-rc\n"
"Report-Msgid-Bugs-To: \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" "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"
@ -1599,19 +1599,11 @@ msgstr ""
msgid "No keywords to match. Please add keywords to your profile." msgid "No keywords to match. Please add keywords to your profile."
msgstr "" msgstr ""
#: mod/match.php:105 src/Content/Pager.php:216 #: mod/match.php:93 src/Module/BaseSearch.php:117
msgid "first"
msgstr ""
#: mod/match.php:110 src/Content/Pager.php:276
msgid "next"
msgstr ""
#: mod/match.php:120 src/Module/BaseSearch.php:117
msgid "No matches" msgid "No matches"
msgstr "" msgstr ""
#: mod/match.php:125 #: mod/match.php:98
msgid "Profile Match" msgid "Profile Match"
msgstr "" msgstr ""
@ -3626,10 +3618,18 @@ msgstr ""
msgid "Embedded content" msgid "Embedded content"
msgstr "" msgstr ""
#: src/Content/Pager.php:216
msgid "first"
msgstr ""
#: src/Content/Pager.php:221 #: src/Content/Pager.php:221
msgid "prev" msgid "prev"
msgstr "" msgstr ""
#: src/Content/Pager.php:276
msgid "next"
msgstr ""
#: src/Content/Pager.php:281 #: src/Content/Pager.php:281
msgid "last" msgid "last"
msgstr "" msgstr ""
@ -4489,33 +4489,33 @@ msgstr ""
msgid "Done. You can now login with your username and password" msgid "Done. You can now login with your username and password"
msgstr "" msgstr ""
#: src/Database/DBStructure.php:64 #: src/Database/DBStructure.php:65
#, php-format #, php-format
msgid "The database version had been set to %s." msgid "The database version had been set to %s."
msgstr "" msgstr ""
#: src/Database/DBStructure.php:77 #: src/Database/DBStructure.php:78
#, php-format #, php-format
msgid "" msgid ""
"The post update is at version %d, it has to be at %d to safely drop the " "The post update is at version %d, it has to be at %d to safely drop the "
"tables." "tables."
msgstr "" msgstr ""
#: src/Database/DBStructure.php:89 #: src/Database/DBStructure.php:90
msgid "No unused tables found." msgid "No unused tables found."
msgstr "" msgstr ""
#: src/Database/DBStructure.php:94 #: src/Database/DBStructure.php:95
msgid "" msgid ""
"These tables are not used for friendica and will be deleted when you execute " "These tables are not used for friendica and will be deleted when you execute "
"\"dbstructure drop -e\":" "\"dbstructure drop -e\":"
msgstr "" 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." msgid "There are no tables on MyISAM or InnoDB with the Antelope file format."
msgstr "" msgstr ""
#: src/Database/DBStructure.php:156 #: src/Database/DBStructure.php:157
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -4523,20 +4523,20 @@ msgid ""
"%s\n" "%s\n"
msgstr "" msgstr ""
#: src/Database/DBStructure.php:159 #: src/Database/DBStructure.php:160
msgid "Errors encountered performing database changes: " msgid "Errors encountered performing database changes: "
msgstr "" msgstr ""
#: src/Database/DBStructure.php:445 #: src/Database/DBStructure.php:550
msgid "Another database update is currently running." msgid "Another database update is currently running."
msgstr "" msgstr ""
#: src/Database/DBStructure.php:449 #: src/Database/DBStructure.php:554
#, php-format #, php-format
msgid "%s: Database update" msgid "%s: Database update"
msgstr "" msgstr ""
#: src/Database/DBStructure.php:749 #: src/Database/DBStructure.php:854
#, php-format #, php-format
msgid "%s: updating %s table." msgid "%s: updating %s table."
msgstr "" msgstr ""