Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
rubenrouwhof committed Jan 28, 2025
1 parent 51cd7b5 commit b0be67b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 14 deletions.
6 changes: 3 additions & 3 deletions amt/locale/base.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2025-01-28 09:28+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"POT-Creation-Date: 0001-01-01 00:00+0000\n"
"PO-Revision-Date: 0001-01-01 00:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.16.0\n"
"Generated-By: Babel 2.15.0\n"

#: amt/api/ai_act_profile.py:24
msgid "Type"
Expand Down
Binary file modified amt/locale/en_US/LC_MESSAGES/messages.mo
Binary file not shown.
4 changes: 2 additions & 2 deletions amt/locale/en_US/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2025-01-28 09:28+0000\n"
"POT-Creation-Date: 0001-01-01 00:00+0000\n"
"PO-Revision-Date: 0001-01-01 00:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en_US\n"
Expand All @@ -16,7 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.16.0\n"
"Generated-By: Babel 2.15.0\n"

#: amt/api/ai_act_profile.py:24
msgid "Type"
Expand Down
Binary file modified amt/locale/nl_NL/LC_MESSAGES/messages.mo
Binary file not shown.
14 changes: 5 additions & 9 deletions amt/locale/nl_NL/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2025-01-28 09:28+0000\n"
"POT-Creation-Date: 0001-01-01 00:00+0000\n"
"PO-Revision-Date: 0001-01-01 00:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: nl_NL\n"
Expand All @@ -16,7 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.16.0\n"
"Generated-By: Babel 2.15.0\n"

#: amt/api/ai_act_profile.py:24
msgid "Type"
Expand Down Expand Up @@ -933,24 +933,20 @@ msgstr "Deze website is in ontwikkeling. Alle versies ontstaan op een open manie

#: amt/site/templates/parts/tasks_board.html.j2:5
msgid "Results for"
msgstr ""
msgstr "Resultaten voor"

#: amt/site/templates/parts/tasks_search.html.j2:9
#, fuzzy
msgid "Taken"
msgstr "Taken"

#: amt/site/templates/parts/tasks_search.html.j2:25
#, fuzzy
msgid "Find tasks..."
msgstr "Vind algoritme..."

#: amt/site/templates/parts/tasks_search.html.j2:55
msgid "Assignee"
msgstr ""
msgstr "Verantwoordelijke"

#: amt/site/templates/parts/tasks_search.html.j2:60
#, fuzzy
msgid "Select assignee"
msgstr "Taal"

msgstr "Selecteer verantwoordelijke"

0 comments on commit b0be67b

Please sign in to comment.