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

Attempt #2 to resolve weblate conflicts #5756

Merged
merged 4 commits into from
Sep 9, 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
3 changes: 1 addition & 2 deletions translations/ar/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: ar <[email protected]>\n"
"Language: ar\n"
Expand Down Expand Up @@ -1598,7 +1598,6 @@ msgstr "This program has been reported"
msgid "request_invalid"
msgstr "Request invalid"

#, fuzzy
msgid "request_teacher"
msgstr "هل ترغب في التقدم بطلب للحصول على حساب المعلم؟"

Expand Down
2 changes: 1 addition & 1 deletion translations/bg/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-05-27 13:48+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: bg <[email protected]>\n"
"Language: bg\n"
Expand Down
2 changes: 1 addition & 1 deletion translations/bn/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: bn <[email protected]>\n"
"Language: bn\n"
Expand Down
14 changes: 13 additions & 1 deletion translations/ca/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: ca <[email protected]>\n"
"Language: ca\n"
Expand Down Expand Up @@ -2541,3 +2541,15 @@ msgstr "El teu programa"
#~ msgid "your_last_program"
#~ msgstr "El teu últim programa guardat"

#~ msgid "already_teacher"
#~ msgstr "Ja tens un compte de professorat."

#~ msgid "already_teacher_request"
#~ msgstr "Teniu una sol·licitud de professor pendent."

#~ msgid "teacher_account_request"
#~ msgstr "Tens una sol·licitud de compte de professorat pendent"

#~ msgid "teacher_account_success"
#~ msgstr "Has sol·licitat un compte de professorat amb èxit."

2 changes: 1 addition & 1 deletion translations/cs/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: cs <[email protected]>\n"
"Language: cs\n"
Expand Down
2 changes: 1 addition & 1 deletion translations/cy/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: cy <[email protected]>\n"
"Language: cy\n"
Expand Down
2 changes: 1 addition & 1 deletion translations/da/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: da <[email protected]>\n"
"Language: da\n"
Expand Down
18 changes: 14 additions & 4 deletions translations/de/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"Last-Translator: Anonymous <[email protected]>\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <noreply-addon-prefill@weblate.org>\n"
"Language-Team: de <[email protected]>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -1507,11 +1507,9 @@ msgstr "Dieses Programm wurde gemeldet"
msgid "request_invalid"
msgstr "Request invalid"

#, fuzzy
msgid "request_teacher"
msgstr "Möchtest du dich für einen Lehr-Konto bewerben?"

#, fuzzy
msgid "request_teacher_account"
msgstr "Lehr-Konto anfordern"

Expand Down Expand Up @@ -2390,3 +2388,15 @@ msgstr "Dein Programm"
#~ msgid "your_last_program"
#~ msgstr "Dein zuletzt gespeichertes Programm"

#~ msgid "already_teacher"
#~ msgstr "Du hast bereits einen Lehr-Konto."

#~ msgid "already_teacher_request"
#~ msgstr "Du hast bereits eine ausstehende Lehr-Anfrage."

#~ msgid "teacher_account_request"
#~ msgstr "Du hast eine offene Lehr-Konto-Anfrage"

#~ msgid "teacher_account_success"
#~ msgstr "Du hast erfolgreich einen Lehr-Konto angefragt."

3 changes: 1 addition & 2 deletions translations/el/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: el <[email protected]>\n"
"Language: el\n"
Expand Down Expand Up @@ -1636,7 +1636,6 @@ msgstr "This program has been reported"
msgid "request_invalid"
msgstr "Request invalid"

#, fuzzy
msgid "request_teacher"
msgstr "Θα ήθελες να κάνεις αίτηση για λογαριασμό καθηγητή;"

Expand Down
2 changes: 1 addition & 1 deletion translations/enm/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-06-26 16:04+0200\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: none\n"
"Language: enm\n"
Expand Down
4 changes: 1 addition & 3 deletions translations/eo/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: eo <[email protected]>\n"
"Language: eo\n"
Expand Down Expand Up @@ -1658,11 +1658,9 @@ msgstr "Ĉi tiu programo estis denuncita"
msgid "request_invalid"
msgstr "Request invalid"

#, fuzzy
msgid "request_teacher"
msgstr "Ĉu vi volas peti instruistan konton?"

#, fuzzy
msgid "request_teacher_account"
msgstr "Peti instruan konton"

Expand Down
4 changes: 1 addition & 3 deletions translations/es/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: es <[email protected]>\n"
"Language: es\n"
Expand Down Expand Up @@ -1455,11 +1455,9 @@ msgstr "Este programa ha sido reportado"
msgid "request_invalid"
msgstr "Request invalid"

#, fuzzy
msgid "request_teacher"
msgstr "¿Te gustaría aplicar a una cuenta de profesor?"

#, fuzzy
msgid "request_teacher_account"
msgstr "Solicita cuenta de profesor/a"

Expand Down
2 changes: 1 addition & 1 deletion translations/et/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: et <[email protected]>\n"
"Language: et\n"
Expand Down
2 changes: 1 addition & 1 deletion translations/fa/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: fa <[email protected]>\n"
"Language: fa\n"
Expand Down
2 changes: 1 addition & 1 deletion translations/fi/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: fi <[email protected]>\n"
"Language: fi\n"
Expand Down
16 changes: 13 additions & 3 deletions translations/fr/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: fr <[email protected]>\n"
"Language: fr\n"
Expand Down Expand Up @@ -1536,11 +1536,9 @@ msgstr "Ce programme a été reporté"
msgid "request_invalid"
msgstr "Request invalid"

#, fuzzy
msgid "request_teacher"
msgstr "Souhaitez-vous postuler pour un compte enseignant ?"

#, fuzzy
msgid "request_teacher_account"
msgstr "Demander un compte enseignant"

Expand Down Expand Up @@ -2434,3 +2432,15 @@ msgstr "Ton programme"
#~ msgid "your_last_program"
#~ msgstr "Votre dernier programme enregistré"

#~ msgid "already_teacher"
#~ msgstr "Vous avez déjà un compte enseignant."

#~ msgid "already_teacher_request"
#~ msgstr "Vous avez déjà une demande de compte enseignant en cours."

#~ msgid "teacher_account_request"
#~ msgstr "Vous avez une demande de compte enseignant en attente"

#~ msgid "teacher_account_success"
#~ msgstr "Votre compte enseignant a été activé avec succès."

2 changes: 1 addition & 1 deletion translations/fr_CA/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-06-26 16:04+0200\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: none\n"
"Language: fr_CA\n"
Expand Down
2 changes: 1 addition & 1 deletion translations/fy/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: fy <[email protected]>\n"
"Language: fy\n"
Expand Down
2 changes: 1 addition & 1 deletion translations/he/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: he <[email protected]>\n"
"Language: he\n"
Expand Down
5 changes: 2 additions & 3 deletions translations/hi/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"Last-Translator: Anonymous <[email protected]>\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <noreply-addon-prefill@weblate.org>\n"
"Language-Team: hi <[email protected]>\n"
"Language: hi\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -1658,7 +1658,6 @@ msgstr "This program has been reported"
msgid "request_invalid"
msgstr "Request invalid"

#, fuzzy
msgid "request_teacher"
msgstr "मैं एक शिक्षक हूं और मैं एक शिक्षक के खाते के लिए आवेदन करना चाहता/चाहती हूं"

Expand Down
2 changes: 1 addition & 1 deletion translations/hr/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-06-26 16:04+0200\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: none\n"
"Language: hr\n"
Expand Down
2 changes: 1 addition & 1 deletion translations/hu/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: hu <[email protected]>\n"
"Language: hu\n"
Expand Down
2 changes: 1 addition & 1 deletion translations/ia/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: none\n"
"Language: ia\n"
Expand Down
2 changes: 1 addition & 1 deletion translations/iba/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-06-26 16:04+0200\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: none\n"
"Language: iba\n"
Expand Down
16 changes: 13 additions & 3 deletions translations/id/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: id <[email protected]>\n"
"Language: id\n"
Expand Down Expand Up @@ -1526,11 +1526,9 @@ msgstr "Program ini telah dilaporkan"
msgid "request_invalid"
msgstr "Request invalid"

#, fuzzy
msgid "request_teacher"
msgstr "Apakah Anda ingin mengajukan akun guru?"

#, fuzzy
msgid "request_teacher_account"
msgstr "Mengajukan akun guru"

Expand Down Expand Up @@ -2400,3 +2398,15 @@ msgstr "Program Anda"
#~ msgid "your_last_program"
#~ msgstr "Program terakhir Anda yang disimpan"

#~ msgid "already_teacher"
#~ msgstr "Anda sudah memiliki akun guru."

#~ msgid "already_teacher_request"
#~ msgstr "Anda sudah memiliki permintaan guru yang tertunda."

#~ msgid "teacher_account_request"
#~ msgstr "Anda memiliki permintaan akun guru yang tertunda"

#~ msgid "teacher_account_success"
#~ msgstr "Anda berhasil meminta akun guru."

2 changes: 1 addition & 1 deletion translations/it/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: it <[email protected]>\n"
"Language: it\n"
Expand Down
2 changes: 1 addition & 1 deletion translations/ja/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2000-01-01 00:00+0000\n"
"PO-Revision-Date: 2024-09-06 12:29+0000\n"
"PO-Revision-Date: 2024-09-06 14:38+0000\n"
"Last-Translator: Prefill add-on <[email protected]>\n"
"Language-Team: ja <[email protected]>\n"
"Language: ja\n"
Expand Down
Loading
Loading