Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev: Merge branch '1.0' into 'main' #706

Merged
merged 16 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified locales/fr_FR/LC_MESSAGES/main.mo
Binary file not shown.
10 changes: 5 additions & 5 deletions locales/fr_FR/LC_MESSAGES/main.po
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Flus\n"
"POT-Creation-Date: 2024-10-03 13:37+0200\n"
"PO-Revision-Date: 2024-10-03 13:38+0200\n"
"POT-Creation-Date: 2024-10-03 14:41+0200\n"
"PO-Revision-Date: 2024-10-03 14:41+0200\n"
"Last-Translator: Marien Fressinaud <[email protected]>\n"
"Language-Team: \n"
"Language: fr_FR\n"
Expand Down Expand Up @@ -46,7 +46,7 @@ msgstr "Cacher"
msgid "Show"
msgstr "Afficher"

#: controllers/Collections.php:101 controllers/Collections.php:313
#: controllers/Collections.php:101 controllers/Collections.php:311
#: controllers/Feeds.php:107 controllers/Groups.php:90
#: controllers/Links.php:270 controllers/Links.php:442
#: controllers/Mastodon.php:211 controllers/Mastodon.php:297
Expand All @@ -69,11 +69,11 @@ msgstr ""
"Une vérification de sécurité a échoué : vous devriez essayer de resoumettre "
"le formulaire."

#: controllers/Collections.php:114 controllers/Collections.php:328
#: controllers/Collections.php:114 controllers/Collections.php:326
msgid "One of the associated topic doesn’t exist."
msgstr "L’une des thématiques associées n’existe pas."

#: controllers/Collections.php:388 controllers/Exportations.php:62
#: controllers/Collections.php:386 controllers/Exportations.php:62
#: controllers/Groups.php:161 controllers/Importations.php:48
#: controllers/Links.php:499 controllers/Mastodon.php:87
#: controllers/Messages.php:94 controllers/Messages.php:145
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use App\models;
use App\services;

class Migration202409200001AddTagsToLinks
class Migration202410030001AddTagsToLinks
{
public function migrate(): bool
{
Expand Down
Loading