mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-26 11:31:08 +00:00
Code Issues Projects Releases Wiki Activity

fixed merge conflict

Browse source
This commit is contained in:
Willi Hohenstein 2022-02-02 20:20:16 +01:00
parent 4503dd6864
commit c2c33fe1e8
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
locale/de_DE/LC_MESSAGES/django.po
View file

@ -4675,15 +4675,5 @@ msgstr "Status -Updates von {obj.display_name}"
#, python-format #, python-format
msgid "Load %(count)d unread status" msgid "Load %(count)d unread status"
msgid_plural "Load %(count)d unread statuses" msgid_plural "Load %(count)d unread statuses"
<<<<<<< HEAD
msgstr[0] ""
msgstr[1] ""
#, python-format
#~ msgid "load <span data-poll=\"stream/%(tab_key)s\">0</span> unread status(es)"
#~ msgstr "lade <span data-poll=\"stream/%(tab_key)s\">0</span> ungelesene Statusmeldung(en)"
=======
msgstr[0] "Lade %(count)d ungelesene Statusmeldung" msgstr[0] "Lade %(count)d ungelesene Statusmeldung"
msgstr[1] "Lade %(count)d ungelesene Statusmeldungen" msgstr[1] "Lade %(count)d ungelesene Statusmeldungen"
>>>>>>> f84241b085a00b54a2f5ba083e8e60311ccb8622