Commit eeeb3d9c authored by Konstantin Schulz's avatar Konstantin Schulz

Merge branch 'develop'

# Conflicts:
#	mc_frontend/src/version.ts
parents 852d4cb7 822bb849
......@@ -84,6 +84,12 @@
</select>
</label>
</ng-template>
<br>
<p style="font-size: small;">
{{ 'EXERCISE_SEARCH_HELP_TITLE' | translate}}<br>
{{ 'EXERCISE_SEARCH_HELP_SELECT_1' | translate}}<br>
{{ 'EXERCISE_SEARCH_HELP_SELECT_2' | translate}}
</p>
</ion-col>
</ion-row>
</ion-grid>
......
......@@ -17,10 +17,89 @@
</ion-toolbar>
</ion-header>
<ion-content>
<ion-grid>
<ion-content class="ion-padding">
<ion-grid style="text-align: justify; padding: 20px;">
<ion-row>
<ion-col></ion-col>
<h2>{{ 'OPERATION_SOFTWARE' | translate }}</h2>
</ion-row>
<ion-row>
<ion-col>
<div class="card-tutorial">
<img src="assets/icon/favicon.jpg" alt="Logo" style="padding: 0.5em 0.25em 0 0.25em; width: 48px;">
<h4>{{ 'OPERATION_SOFTWARE_LOGO_TITLE' | translate }}</h4>
<p>{{ 'OPERATION_SOFTWARE_LOGO_TEXT' | translate }}</p>
</div>
</ion-col>
<ion-col>
<div class="card-tutorial">
<ion-icon name="caret-down-outline" style="padding: 0.5em 0.25em 0 0.25em;"></ion-icon>
<h4>{{ 'OPERATION_SOFTWARE_LANGUAGE_TITLE' | translate }}</h4>
<p>{{ 'OPERATION_SOFTWARE_LANGUAGE_TEXT' | translate }}</p>
</div>
</ion-col>
<ion-col>
<div class="card-tutorial">
<ion-icon name="menu-outline" style="padding: 0.5em 0.25em 0 0.25em;"></ion-icon>
<h4>{{ 'OPERATION_SOFTWARE_MENU_TITLE' | translate }}</h4>
<p>{{ 'OPERATION_SOFTWARE_MENU_TEXT' | translate }}</p>
</div>
</ion-col>
<ion-col>
<div class="card-tutorial">
<ion-icon name="book-outline" style="padding: 0.5em 0.25em 0 0.25em;"></ion-icon>
<h4>{{ 'OPERATION_SOFTWARE_DOCUMENTATION_TITLE' | translate }}</h4>
<p>{{ 'OPERATION_SOFTWARE_DOCUMENTATION_TEXT' | translate }}</p>
</div>
</ion-col>
<ion-col>
<div class="card-tutorial">
<ion-icon name="refresh-outline" style="padding: 0.5em 0.25em 0 0.25em;"></ion-icon>
<h4>{{ 'OPERATION_SOFTWARE_CORPORA_TITLE' | translate }}</h4>
<p>{{ 'OPERATION_SOFTWARE_CORPORA_TEXT' | translate }}</p>
</div>
</ion-col>
</ion-row>
<ion-row>
<h2>{{'TUTORIAL_SOFTWARE_TITLE' | translate }}</h2>
</ion-row>
<ion-row>
<ol>
<li>
{{'TUTORIAL_SOFTWARE_Q1' | translate }}
</li>
<li>
{{'TUTORIAL_SOFTWARE_Q2' | translate }}
</li>
<li>
{{'TUTORIAL_SOFTWARE_Q3' | translate }}
</li>
</ol>
</ion-row>
<ion-row>
<h2>{{ 'TUTORIAL_TEXTS_TITLE' | translate }}</h2>
</ion-row>
<ion-row>
<ol>
<li>
{{ 'TUTORIAL_TEXTS_Q1' | translate }}
</li>
<li>
{{ 'TUTORIAL_TEXTS_Q2' | translate }}
</li>
</ol>
</ion-row>
<ion-row>
<h2>{{ 'TUTORIAL_PHILOLOGY_TITLE' | translate }}</h2>
</ion-row>
<ion-row>
<ol>
<li>
{{ 'TUTORIAL_PHILOLOGY_Q1' | translate }}
</li>
</ol>
</ion-row>
<ion-row>
<p></p>
</ion-row>
</ion-grid>
</ion-content>
</ion-content>
\ No newline at end of file
......@@ -195,6 +195,9 @@
"EXERCISE_LIST_LEGEND": "Das Hantel-Symbol zeigt die Komplexität des Textes an, für den die Übung generiert wurde. Ein niedriger Wert weist auf einen einfachen Text hin, ein hoher auf einen schweren. Sofern ein Vokabelabgleich durchgeführt wurde, gibt die Prozentzahl die Übereinstimmung des Textes mit dem gewählten Zielvokabular an.",
"EXERCISE_NO_OOV": "Unbekannte Vokabeln ausschließen",
"EXERCISE_PARAMETERS": "Übungsparameter",
"EXERCISE_SEARCH_HELP_TITLE": "Auswahl mehrerer Optionen:",
"EXERCISE_SEARCH_HELP_SELECT_1": "einzeln: Strg + linke Maustaste",
"EXERCISE_SEARCH_HELP_SELECT_2": "im Verbund: Umschalttaste + linke Maustaste",
"EXERCISE_SET_PARAMETERS": "Parameter festlegen",
"EXERCISE_TYPE": "Übungstyp",
"EXERCISE_TYPE_CLOZE": "Lückentext",
......@@ -245,6 +248,17 @@
"NO_ENTRY_FOUND": "Kein Eintrag verfügbar",
"NO_EXERCISES_FOUND": "Keine Übungen gefunden",
"OF": "von",
"OPERATION_SOFTWARE": "Bedienung der Software",
"OPERATION_SOFTWARE_CORPORA_TEXT": "Bei einer Fehlermeldung zu den Korpora hier die Daten der Korpora aktualisieren.",
"OPERATION_SOFTWARE_CORPORA_TITLE": "Korpora aktualisieren",
"OPERATION_SOFTWARE_DOCUMENTATION_TEXT": "Alles rund um die Software und das Forschungsprojekt",
"OPERATION_SOFTWARE_DOCUMENTATION_TITLE": "Dokumentation",
"OPERATION_SOFTWARE_LANGUAGE_TEXT": "Zur Auswahl der Sprachen Deutsch oder Englisch.",
"OPERATION_SOFTWARE_LANGUAGE_TITLE": "Sprache umschalten",
"OPERATION_SOFTWARE_LOGO_TEXT": "Ein Klick auf das Logo führt zurück zur Startseite.",
"OPERATION_SOFTWARE_LOGO_TITLE": "Logo der Software",
"OPERATION_SOFTWARE_MENU_TEXT": "Direktes Ansteuern der Software-Funktionen",
"OPERATION_SOFTWARE_MENU_TITLE": "Menu",
"PART_OF_SPEECH_ADJECTIVE": "Adjektiv",
"PART_OF_SPEECH_ADVERB": "Adverb",
"PART_OF_SPEECH_AUXILIARY": "Auxiliarverb",
......@@ -359,6 +373,15 @@
"TEXT_WORK": "Textarbeit",
"TOO_MANY_SEARCH_RESULTS": "Zu viele Treffer. Bitte Auswahl einschränken...",
"TUTORIAL": "Tutorial: Machina Callida",
"TUTORIAL_PHILOLOGY_Q1": "Untersuchen Sie die Verwendung von pinguis und salubritas in Palladius 1.1-1.5 im Kontext.",
"TUTORIAL_PHILOLOGY_TITLE": "Philologische Forschung",
"TUTORIAL_SOFTWARE_Q1": "Welcher der vorhandenen Übungstypen ist nicht interaktiv?",
"TUTORIAL_SOFTWARE_Q2": "Welche Exportformate stehen für jede selbst erstellte Übung zur Verfügung?",
"TUTORIAL_SOFTWARE_Q3": "Zu welchem Werk gibt es die meisten Übungen?",
"TUTORIAL_SOFTWARE_TITLE": "Fragen zur Software",
"TUTORIAL_TEXTS_Q1": "Mit welchem Vokabular erreiche ich eine höhere Textabdeckung für das erste Kapitel aus Caesars Bellum Gallicum: VIVA oder Bamberger Wortschatz?",
"TUTORIAL_TEXTS_Q2": " Welcher Text enthält mehr Ablativi Absoluti: die ersten 58 Sätze der Vulgata oder die ersten 17 Sätze aus Ciceros 'De officiis'?",
"TUTORIAL_TEXTS_TITLE": "Passende Textstellen finden",
"TYPE": "Typ",
"UNIT_APPLICATION_TITLE": "Wortschatzarbeit am Text",
"UNIT_DATA_SECURITY": "Datenschutz: Es werden keine persönlichen Daten erhoben. Die Ergebnisse können auch nicht bis zu einzelnen Teilnehmern zurückverfolgt werden.",
......
......@@ -195,6 +195,9 @@
"EXERCISE_LIST_LEGEND": "The barbell symbol indicates the complexity of the text from which the exercise was generated. A low value represents an easy text, a high value represents a difficult text. If a vocabulary check has been performed, the percentage indicates the amount of overlap between the text and the desired target vocabulary.",
"EXERCISE_NO_OOV": "Exclude unknown words",
"EXERCISE_PARAMETERS": "Exercise parameters",
"EXERCISE_SEARCH_HELP_TITLE": "Multiple options selection:",
"EXERCISE_SEARCH_HELP_SELECT_1": "Single: Ctrl + left mouse button",
"EXERCISE_SEARCH_HELP_SELECT_2": "in combination: Shift key + left mouse button",
"EXERCISE_SET_PARAMETERS": "Set parameters",
"EXERCISE_TYPE": "Exercise type",
"EXERCISE_TYPE_CLOZE": "Cloze",
......@@ -245,6 +248,17 @@
"NO_ENTRY_FOUND": "No entry available",
"NO_EXERCISES_FOUND": "No exercises found",
"OF": "of",
"OPERATION_SOFTWARE": "Operation of the software",
"OPERATION_SOFTWARE_CORPORA_TEXT": "In case of an error message regarding the corpora, update the corpora data here.",
"OPERATION_SOFTWARE_CORPORA_TITLE": "Corpora update",
"OPERATION_SOFTWARE_DOCUMENTATION_TEXT": "Everything about the software and the research project",
"OPERATION_SOFTWARE_DOCUMENTATION_TITLE": "Documentation",
"OPERATION_SOFTWARE_LANGUAGE_TEXT": "To select the languages German or English.",
"OPERATION_SOFTWARE_LANGUAGE_TITLE": "Select language",
"OPERATION_SOFTWARE_LOGO_TEXT": "A click on the logo leads back to the homepage.",
"OPERATION_SOFTWARE_LOGO_TITLE": "Software logo",
"OPERATION_SOFTWARE_MENU_TEXT": "Direct control of the software functions",
"OPERATION_SOFTWARE_MENU_TITLE": "Menu",
"PART_OF_SPEECH_ADJECTIVE": "Adjective",
"PART_OF_SPEECH_ADVERB": "Adverb",
"PART_OF_SPEECH_AUXILIARY": "Auxiliary verb",
......@@ -359,6 +373,15 @@
"TEXT_WORK": "Text work",
"TOO_MANY_SEARCH_RESULTS": "Too many hits. Please refine your query...",
"TUTORIAL": "Tutorial: Machina Callida",
"TUTORIAL_PHILOLOGY_Q1": "Examine the use of pinguis and salubritas in Palladius 1.1-1.5 in context.",
"TUTORIAL_PHILOLOGY_TITLE": "Philological research",
"TUTORIAL_SOFTWARE_Q1": "Which of the existing exercise types is not interactive?",
"TUTORIAL_SOFTWARE_Q2": "Which export formats are available for each self-created exercise?",
"TUTORIAL_SOFTWARE_Q3": "For which work are there the most exercises?",
"TUTORIAL_SOFTWARE_TITLE": "Software questions",
"TUTORIAL_TEXTS_Q1": "With which vocabulary do I achieve a higher text coverage for the first chapter of Caesar's Bellum Gallicum: VIVA or Bamberg vocabulary?",
"TUTORIAL_TEXTS_Q2": "Which text contains more Ablativi Absoluti: the first 58 sentences of the Vulgate or the first 17 sentences of Cicero's 'De officiis'?",
"TUTORIAL_TEXTS_TITLE": "Find suitable texts",
"TYPE": "Type",
"UNIT_APPLICATION_TITLE": "Vocabulary work on text",
"UNIT_DATA_SECURITY": "Privacy protection: No personal data will be collected. The results can also not be traced up to individual participants.",
......
......@@ -129,6 +129,15 @@
margin: auto;
text-align: center;
}
.card-tutorial {
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
max-width: 200px;
height: 250px;
padding: 10px;
margin: auto;
text-align: center;
}
.hide {
display: none;
......
export const version = '2.4.2';
Markdown is supported
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