Skip to content
Snippets Groups Projects
Commit 1185eddd authored by Philipp Sautner's avatar Philipp Sautner
Browse files

Merge branch 'questions-to-be-selected' into 'staging'

Fixing bugs caused by merge conflicts

See merge request arsnova/topic-cloud!18
parents 2c5d7b73 26ebb149
No related merge requests found
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
"motd": "News", "motd": "News",
"tag-cloud-config": "Wolkenansicht ändern", "tag-cloud-config": "Wolkenansicht ändern",
"tag-cloud-administration": "Wolkenthemen editieren", "tag-cloud-administration": "Wolkenthemen editieren",
"questions-blocked": "Fragen sind deaktiviert!" "questions-blocked": "Fragen sind deaktiviert!",
"overview-question-tooltip": "Anzahl gestellter Fragen", "overview-question-tooltip": "Anzahl gestellter Fragen",
"overview-questioners-tooltip": "Anzahl Fragensteller*innen", "overview-questioners-tooltip": "Anzahl Fragensteller*innen",
"overview-keywords-tooltip": "Anzahl Schlüsselwörter" "overview-keywords-tooltip": "Anzahl Schlüsselwörter"
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
"motd": "News", "motd": "News",
"tag-cloud-config": "Modify cloud view", "tag-cloud-config": "Modify cloud view",
"tag-cloud-administration": "Edit cloud topics", "tag-cloud-administration": "Edit cloud topics",
"questions-blocked": "Questions are blocked!" "questions-blocked": "Questions are blocked!",
"overview-question-tooltip": "Number of questions", "overview-question-tooltip": "Number of questions",
"overview-questioners-tooltip": "Number of questioners", "overview-questioners-tooltip": "Number of questioners",
"overview-keywords-tooltip": "Number of Keywords" "overview-keywords-tooltip": "Number of Keywords"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment