Merge branch 'testing' into 'master'

Fixed regex for license (thanks Markus), updated de translation

See merge request piotrex43/RcGcDw!3

locale/de/LC_MESSAGES/rcgcdw.po

@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2018-06-21 23:24+0200\n"
+"POT-Creation-Date: 2018-06-23 17:33+0200\n"
-"PO-Revision-Date: 2018-06-21 23:39+0200\n"
+"PO-Revision-Date: 2018-06-24 00:35+0200\n"
-"Last-Translator: Frisk <piotrex43@protonmail.ch>\n"
+"Last-Translator: \n"
 "Language-Team: \n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -16,30 +16,39 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 "X-Generator: Poedit 2.0.8\n"
 
+#: rcgcdw.py:103
 msgid "(N!) "
 msgstr "(N!) "
 
+#: rcgcdw.py:103
 msgid "m "
 msgstr "K "
 
+#: rcgcdw.py:116
 msgid "Uploaded a new version of {name}"
 msgstr "Neue Dateiversion {name}"
 
+#: rcgcdw.py:117
 msgid "([preview]({link}) | [undo]({undolink}))"
 msgstr "([Vorschau]({link}) | [zurücksetzen]({undolink}))"
 
+#: rcgcdw.py:117 rcgcdw.py:133
 msgid "Options"
 msgstr "Optionen"
 
+#: rcgcdw.py:119
 msgid "Uploaded {name}"
 msgstr "Neue Datei {name}"
 
+#: rcgcdw.py:126
 msgid "**No license!**"
 msgstr "**Keine Lizenz!**"
 
+#: rcgcdw.py:133
 msgid "([preview]({link}))"
 msgstr "([Vorschau]({link}))"
 
+#: rcgcdw.py:134
 msgid ""
 "{desc}\n"
 "License: {license}"
@@ -47,227 +56,302 @@ msgstr ""
 "{desc}\n"
 "Lizenz: {license}"
 
+#: rcgcdw.py:137
 msgid "Deleted page {article}"
 msgstr "Löschte {article}"
 
+#: rcgcdw.py:140
 msgid "Deleted redirect {article} by overwriting"
 msgstr "Löschte die Weiterleitung {article} um Platz zu machen"
 
+#: rcgcdw.py:143
 msgid "A redirect has been made"
 msgstr "Eine Weiterleitung wurde erstellt"
 
+#: rcgcdw.py:143
 msgid "No redirect has been made"
 msgstr "Die Erstellung einer Weiterleitung wurde unterdrückt"
 
+#: rcgcdw.py:144
 msgid "Moved {article} to {target}"
 msgstr "Verschob {article} nach {target}"
 
+#: rcgcdw.py:147
 msgid "Moved {article} to {title} over redirect"
 msgstr "Verschob {article} nach {target} und überschrieb eine Weiterleitung\""
 
+#: rcgcdw.py:150
 msgid "Moved protection settings from {article} to {title}"
 msgstr "Verschob die Schutzeinstellungen von {article} nach {title}"
 
+#: rcgcdw.py:154
 msgid "infinity and beyond"
 msgstr "alle Ewigkeit"
 
+#: rcgcdw.py:155
 msgid "Blocked {blocked_user} for {time}"
 msgstr "Sperrte {blocked_user} für {time}"
 
+#: rcgcdw.py:159
 msgid "Changed block settings for {blocked_user}"
 msgstr "Änderte die Sperreinstellungen für {blocked_user}"
 
+#: rcgcdw.py:163
 msgid "Unblocked {blocked_user}"
 msgstr "Hob die Sperre von {blocked_user} auf"
 
+#: rcgcdw.py:167
 msgid "Left a comment on {target}'s profile"
 msgstr "Hinterließ ein Kommentar auf dem Profil von {target}"
 
+#: rcgcdw.py:171
 msgid "Replied to a comment on {target}'s profile"
 msgstr "Antwortete auf ein Kommentar auf dem Profil von {target}"
 
+#: rcgcdw.py:175
 msgid "Edited a comment on {target}'s profile"
 msgstr "Bearbeitete ein Kommentar auf dem Profil von {target}"
 
+#: rcgcdw.py:179
 msgid "Location"
 msgstr "Wohnort"
 
+#: rcgcdw.py:181
 msgid "About me"
 msgstr "\"Über mich\"-Abschnitt"
 
+#: rcgcdw.py:183
 msgid "Google link"
 msgstr "Google-Konto"
 
+#: rcgcdw.py:185
 msgid "Facebook link"
 msgstr "Facebook-Seite"
 
+#: rcgcdw.py:187
 msgid "Twitter link"
 msgstr "Twitter-Benutzernamen"
 
+#: rcgcdw.py:189
 msgid "Reddit link"
 msgstr "Reddit-Benutzernamen"
 
+#: rcgcdw.py:191
 msgid "Twitch link"
 msgstr "Twitch-Account"
 
+#: rcgcdw.py:193
 msgid "PSN link"
 msgstr "PSN-Account"
 
+#: rcgcdw.py:195
 msgid "VK link"
 msgstr "VK-Account"
 
+#: rcgcdw.py:197
 msgid "XVL link"
 msgstr "Xbox-Live-Tag"
 
+#: rcgcdw.py:199
 msgid "Steam link"
 msgstr "Steam-Account"
 
+#: rcgcdw.py:201
 msgid "Unknown"
 msgstr "Unbekannt"
 
+#: rcgcdw.py:202
 msgid "Edited {target}'s profile"
 msgstr "Bearbeitete das Profil von {target}"
 
+#: rcgcdw.py:203
 msgid "{field} field changed to: {desc}"
 msgstr "{field} geändert zu: {desc}"
 
+#: rcgcdw.py:207
 msgid "Deleted a comment on {target}'s profile"
 msgstr "Löschte ein Kommentar auf dem Profil von {target}"
 
+#: rcgcdw.py:210
 msgid "Changed group membership for {target}"
 msgstr "Änderte die Gruppenzugehörigkeit von {target}"
 
+#: rcgcdw.py:214 rcgcdw.py:216
 msgid "none"
 msgstr "keine"
 
+#: rcgcdw.py:217 rcgcdw.py:311
 msgid "No description provided"
 msgstr "Keine Zusammenfassung angegeben"
 
+#: rcgcdw.py:218
 msgid "Groups changed from {old_groups} to {new_groups} {reason}"
 msgstr "Änderte die Gruppenzugehörigkeit von {old_groups} auf {new_groups}: {reason}"
 
+#: rcgcdw.py:221
 msgid "Protected {target}"
 msgstr "Schützte {target}"
 
+#: rcgcdw.py:225
 msgid "Changed protection level for {article}"
 msgstr "Änderte den Schutzstatus von {article}"
 
+#: rcgcdw.py:229
 msgid "Removed protection from {article}"
 msgstr "Entfernte den Schutz von {article}"
 
+#: rcgcdw.py:232
 msgid "Changed visibility of revision(s) on page {article} "
 msgstr "Änderte die Sichtbarkeit einiger Versionen von {article}"
 
+#: rcgcdw.py:235
 msgid "Imported {article} with {count} revision(s)"
 msgstr "Importierte {article} mit {count} Versionen"
 
+#: rcgcdw.py:238
 msgid "Restored {article}"
 msgstr "Stellte {article} wieder her"
 
+#: rcgcdw.py:241
 msgid "Changed visibility of log events"
 msgstr "Änderte die Sichtbarkeit eines Logbucheintrags"
 
+#: rcgcdw.py:244
 msgid "Imported interwiki"
 msgstr "Importierte Interwiki"
 
+#: rcgcdw.py:247
 msgid "Edited abuse filter number {number}"
 msgstr "Änderte Missbrauchsfilter {number}"
 
+#: rcgcdw.py:250
 msgid "Merged revision histories of {article} into {dest}"
 msgstr "Vereinigte Versionsgeschichten von {article} in {dest}"
 
+#: rcgcdw.py:253
 msgid "Added an entry to the interwiki table"
 msgstr "Fügte ein Interwiki-Präfix hinzu"
 
+#: rcgcdw.py:254 rcgcdw.py:258
 msgid "Prefix: {prefix}, website: {website} | {desc}"
 msgstr "Präfix: {prefix}, URL: {website} | {desc}"
 
+#: rcgcdw.py:257
 msgid "Edited an entry in interwiki table"
 msgstr "Änderte ein Interwiki-Präfix"
 
+#: rcgcdw.py:261
 msgid "Deleted an entry in interwiki table"
 msgstr "Entfernte ein Interwiki-Präfix"
 
+#: rcgcdw.py:262
 msgid "Prefix: {prefix} | {desc}"
 msgstr "Präfix: {prefix} | {desc}"
 
+#: rcgcdw.py:265
 msgid "Changed the content model of the page {article}"
 msgstr "Änderte das Inhaltsmodell von {article}"
 
+#: rcgcdw.py:266
 msgid "Model changed from {old} to {new}: {reason}"
 msgstr "Modell geändert von {old} zu {new}: {reason}"
 
+#: rcgcdw.py:269
 msgid "Edited the sprite for {article}"
 msgstr "Edited the sprite for {article}"
 
+#: rcgcdw.py:272
 msgid "Created the sprite sheet for {article}"
 msgstr "Created the sprite sheet for {article}"
 
+#: rcgcdw.py:275
 msgid "Edited the slice for {article}"
 msgstr "Edited the slice for {article}"
 
+#: rcgcdw.py:278
 msgid "Created a tag \"{tag}\""
 msgstr "Erstellte die Markierung \"{tag}\""
 
+#: rcgcdw.py:281
 msgid "Deleted a tag \"{tag}\""
 msgstr "Löschte die Markierung \"{tag}\""
 
+#: rcgcdw.py:284
 msgid "Activated a tag \"{tag}\""
 msgstr "Aktivierte die Markierung \"{tag}\""
 
+#: rcgcdw.py:287
 msgid "Deactivated a tag \"{tag}\""
 msgstr "Deaktivierte die Markierung \"{tag}\""
 
+#: rcgcdw.py:405
 msgid "Unable to process the event"
 msgstr "Ereignis kann nicht verabreitet werden"
 
+#: rcgcdw.py:405
 msgid "error"
 msgstr "Fehler"
 
+#: rcgcdw.py:485
 msgid "Daily overview"
-msgstr ""
+msgstr "Tägliche Übersicht"
 
+#: rcgcdw.py:508 rcgcdw.py:509
 msgid "But nobody came"
-msgstr ""
+msgstr "Keine Aktivität"
 
+#: rcgcdw.py:512
+msgid " ({} actions)"
+msgstr "({} Aktionen)"
+
+#: rcgcdw.py:512
 msgid "Admin actions"
 msgstr "Adminaktionen"
 
+#: rcgcdw.py:512
 msgid "Bytes changed"
 msgstr "Bytes geändert"
 
+#: rcgcdw.py:512
 msgid "Day score"
 msgstr "Tageswert"
 
+#: rcgcdw.py:512
 msgid "Edits made"
 msgstr "Bearbeitungen"
 
-#, fuzzy
+#: rcgcdw.py:512
-#| msgid "Most active user"
 msgid "Most active hours"
-msgstr "Aktivster Benutzer"
+msgstr "Aktivste Stunden"
 
-#, fuzzy
+#: rcgcdw.py:512
-#| msgid "Most active user"
 msgid "Most active users"
-msgstr "Aktivster Benutzer"
+msgstr "Aktivste Benutzer"
 
-#, fuzzy
+#: rcgcdw.py:512
-#| msgid "Restored {article}"
 msgid "New articles"
-msgstr "Stellte {article} wieder her"
+msgstr "Neue Artikel"
 
+#: rcgcdw.py:512
 msgid "New files"
 msgstr "Neue Dateien"
 
+#: rcgcdw.py:512
+msgid "UTC ({} actions)"
+msgstr "UTC ({} Aktionen)"
+
+#: rcgcdw.py:512
 msgid "Unique contributors"
 msgstr "Einzelne Autoren"
 
+#: rcgcdw.py:625
 msgid "Connection status"
 msgstr "Verbindungsstatus"
 
+#: rcgcdw.py:625
 msgid "{wiki} seems to be down or unreachable."
 msgstr "Das {wiki} scheint unerreichbar zu sein."
 
+#: rcgcdw.py:635
 msgid "{wiki} is back up!"
 msgstr "Das {wiki} ist wieder erreichbar."

rcgcdw.py

@@ -127,7 +127,7 @@ def webhook_formatter(action, STATIC, **params):
 			else:
 				matches = re.search(r"\{\{(license|lizenz)(\ |\|)(.*?)\}\}", content)
 				if matches is not None:
-					license = matches.group(1)
+					license = matches.group(3)
 				else:
 					license = "?"
 			embed["fields"] = [{"name": _("Options"), "value": _("([preview]({link}))").format(link=embed["image"]["url"])}]