Commit 6a6dfe6e authored by Klaus-Dieter Quibeldey-Cirkel's avatar Klaus-Dieter Quibeldey-Cirkel 🏀

bulk rewording

parent 74516b83
...@@ -29,7 +29,7 @@ Implementation of a backend and sales platform ...@@ -29,7 +29,7 @@ Implementation of a backend and sales platform
## 2.1.0 ## 2.1.0
Migration of THMcards to Meteor 1.3 Migration of THM.cards to Meteor 1.3
#### Features #### Features
* Implementation of GitLab CI * Implementation of GitLab CI
...@@ -45,7 +45,7 @@ Migration of THMcards to Meteor 1.3 ...@@ -45,7 +45,7 @@ Migration of THMcards to Meteor 1.3
## 2.0.0 ## 2.0.0
Reimplementation of THMcards with the Meteor Framework Reimplementation of THM.cards with the Meteor Framework
#### Features #### Features
* Responsive design * Responsive design
......
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
"moreResults": "Zeige weitere Einträge", "moreResults": "Zeige weitere Einträge",
"learnphase": "Bonus", "learnphase": "Bonus",
"activeLearnphase": "Bonus", "activeLearnphase": "Bonus",
"inactiveLearnphase": "Bonusphase abgelaufen", "inactiveLearnphase": "beendet",
"learnphaseInfo": "Über diese Lernphase mit Bonusvergabe", "learnphaseInfo": "Über diese Lernphase mit Bonusvergabe",
"cardsetInfo": "Über diesen __type__ Kartensatz", "cardsetInfo": "Über diesen __type__ Kartensatz",
"cardsetInfoStatic": "Über diesen Kartensatz", "cardsetInfoStatic": "Über diesen Kartensatz",
...@@ -583,14 +583,14 @@ ...@@ -583,14 +583,14 @@
"card": { "card": {
"cardType0": { "cardType0": {
"name": "Lerneinheit", "name": "Lerneinheit",
"front": "Fragen zum Lernziel / Thema", "front": "Fragen zum Lernziel",
"back": "Antworten", "back": "Antworten",
"hint": "Links / Literatur ", "hint": "Links | Literatur ",
"lecture": "Lerninhalt", "lecture": "Lerninhalt",
"placeholders": { "placeholders": {
"front": "Fragen zur Überprüfung des Lernziels", "front": "Fragen zur Überprüfung des Lernziels",
"back": "Antworten auf die Fragen zum Lernziel / Thema der Lerneinheit", "back": "Antworten auf die Fragen zum Lernziel",
"hint": "Links und Literatur zur Vertiefung des Lerninhalts", "hint": "Links | Literatur zur Vertiefung des Lerninhalts",
"lecture": "Inhalt der Lerneinheit" "lecture": "Inhalt der Lerneinheit"
} }
}, },
...@@ -607,20 +607,20 @@ ...@@ -607,20 +607,20 @@
"name": "Mitschrift", "name": "Mitschrift",
"front": "Mitschrift", "front": "Mitschrift",
"back": "Nachbearbeitung", "back": "Nachbearbeitung",
"hint": "Offene Fragen / ToDos", "hint": "Offene Fragen | ToDos",
"placeholders": { "placeholders": {
"front": "Mitschrift zur Veranstaltung", "front": "Mitschrift zur Veranstaltung",
"back": "Nachbearbeitung der Lerninhalte", "back": "Nachbearbeitung der Lerninhalte",
"hint": "Noch nicht verstanden und ToDos" "hint": "Noch nicht verstanden | ToDos"
} }
}, },
"cardType3": { "cardType3": {
"name": "Fachbegriff", "name": "Fachbegriff",
"front": "Fachbegriff", "front": "Fachbegriff",
"back": "Definition / Beschreibung", "back": "Definition | Beschreibung",
"placeholders": { "placeholders": {
"front": "Fachbegriff", "front": "Fachbegriff",
"back": "Definition / Beschreibung des Fachbegriffs" "back": "Definition | Beschreibung des Fachbegriffs"
} }
}, },
"cardType4": { "cardType4": {
...@@ -711,7 +711,7 @@ ...@@ -711,7 +711,7 @@
"copyCardTitle": "Karte kopieren", "copyCardTitle": "Karte kopieren",
"copyCardText": "Wähle einen Kartensatz als Ziel für den Kopiervorgang.", "copyCardText": "Wähle einen Kartensatz als Ziel für den Kopiervorgang.",
"copycardSuccess": "Karte wurde kopiert", "copycardSuccess": "Karte wurde kopiert",
"cardsubject": "Lernziel / Thema", "cardsubject": "Lernziel | Thema",
"options": "Optionen", "options": "Optionen",
"fronttext_required": "Bitte Vorderseite ausfüllen!", "fronttext_required": "Bitte Vorderseite ausfüllen!",
"backtext_required": "Bitte Rückseite ausfüllen!", "backtext_required": "Bitte Rückseite ausfüllen!",
...@@ -786,7 +786,7 @@ ...@@ -786,7 +786,7 @@
"badgetext3": " erhalten", "badgetext3": " erhalten",
"connection": { "connection": {
"title": "Um THM.cards online nutzen zu können, ist eine WebSocket-Verbindung zum Server erforderlich.", "title": "Um THM.cards online nutzen zu können, ist eine WebSocket-Verbindung zum Server erforderlich.",
"webSocket": "WebSocket-Prüfung", "webSocket": "WebSocket-Check",
"connected": "okay", "connected": "okay",
"disconnected": "keine Verbindung" "disconnected": "keine Verbindung"
}, },
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
} }
}, },
"intro": { "intro": {
"about": "About THMcards", "about": "About THM.cards",
"learnMore": "Learn more...", "learnMore": "Learn more...",
"impressum": "Legal Notice", "impressum": "Legal Notice",
"backButton": "Back", "backButton": "Back",
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
"carousel-inner": { "carousel-inner": {
"carousel-header-0": " Your digital flashcards", "carousel-header-0": " Your digital flashcards",
"carousel-paragraph-0": "Create an learn your own digital flashcards.", "carousel-paragraph-0": "Create an learn your own digital flashcards.",
"carousel-header-1": "THMcards speaks TeX", "carousel-header-1": "THM.cards speaks TeX",
"carousel-paragraph-1": "Finally, an easy way to learn bulky mathematical formulas.", "carousel-paragraph-1": "Finally, an easy way to learn bulky mathematical formulas.",
"carousel-header-2": "Hello World!", "carousel-header-2": "Hello World!",
"carousel-paragraph-2": "Learn program code easier - thanks to an automatic syntax highlighting." "carousel-paragraph-2": "Learn program code easier - thanks to an automatic syntax highlighting."
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
"none": "None" "none": "None"
}, },
"contact": { "contact": {
"about": "THMcards", "about": "THM.cards",
"learning": "Learning", "learning": "Learning",
"help": "Help", "help": "Help",
"faq": "FAQ", "faq": "FAQ",
...@@ -131,8 +131,8 @@ ...@@ -131,8 +131,8 @@
}, },
"confirm-form-profile": { "confirm-form-profile": {
"title": "Delete user profile", "title": "Delete user profile",
"text": "If you do not think you will use THMcards again, you can delete here your user profile. Keep in mind that you will not be able to reactivate your user profile or retrieve any of the content or information you have added. By deleting your user profile all personal data and private cardsets will be deleted. Published content remain in THMcards, so other users of the system can use them.", "text": "If you do not think you will use THM.cards again, you can delete here your user profile. Keep in mind that you will not be able to reactivate your user profile or retrieve any of the content or information you have added. By deleting your user profile all personal data and private cardsets will be deleted. Published content remain in THM.cards, so other users of the system can use them.",
"text2": "If you would still like to delete your user profile, please click the button \"Delete user profile\". After the process you will be automatically logged out of THMcards." "text2": "If you would still like to delete your user profile, please click the button \"Delete user profile\". After the process you will be automatically logged out of THM.cards."
}, },
"confirmLearn-form": { "confirmLearn-form": {
"title": "Start Learning-Phase", "title": "Start Learning-Phase",
...@@ -316,7 +316,7 @@ ...@@ -316,7 +316,7 @@
"settings": { "settings": {
"name": "Profile", "name": "Profile",
"delete": "Delete user profile", "delete": "Delete user profile",
"deleteText": "If you do not think you will use THMcards again, you can delete here your user profile.", "deleteText": "If you do not think you will use THM.cards again, you can delete here your user profile.",
"appearance": "Appearance", "appearance": "Appearance",
"theme": "Color theme", "theme": "Color theme",
"language": "Language" "language": "Language"
...@@ -1015,8 +1015,8 @@ ...@@ -1015,8 +1015,8 @@
"clock": "", "clock": "",
"roles": "User roles", "roles": "User roles",
"blocked": "Blocked user", "blocked": "Blocked user",
"blockedtext": "Do you want to deny the access to THMcards for this user?", "blockedtext": "Do you want to deny the access to THM.cards for this user?",
"editortext": "Do you want to give this user admin rights? As an admin user the user can access the admin panel and is allowed to edit content of THMcards.", "editortext": "Do you want to give this user admin rights? As an admin user the user can access the admin panel and is allowed to edit content of THM.cards.",
"blocked_text": "Reason for block", "blocked_text": "Reason for block",
"blockedtext_invalid": "The \"Reason for block\" field is required!", "blockedtext_invalid": "The \"Reason for block\" field is required!",
"cancel": "Cancel", "cancel": "Cancel",
...@@ -1048,7 +1048,7 @@ ...@@ -1048,7 +1048,7 @@
"button": "Accept" "button": "Accept"
}, },
"mailNotification": { "mailNotification": {
"subjectTitle": "THMcards: Today ", "subjectTitle": "THM.cards: Today ",
"subjectSingular1": "is ", "subjectSingular1": "is ",
"subjectPlural1": "are ", "subjectPlural1": "are ",
"subjectSingular2": " card ", "subjectSingular2": " card ",
...@@ -1058,11 +1058,11 @@ ...@@ -1058,11 +1058,11 @@
"textEnd": " for learning. ", "textEnd": " for learning. ",
"newCards2Singular": " card awaits you in the cardset ", "newCards2Singular": " card awaits you in the cardset ",
"newCards2Plural": " cards await you in the cardset ", "newCards2Plural": " cards await you in the cardset ",
"greetings": "\n\nyour THMCards-Team", "greetings": "\n\nyour THM.cards-Team",
"subjectEnding": "ends the learning-phase of the cardset ", "subjectEnding": "ends the learning-phase of the cardset ",
"textIntroEnding": "Dear participant,\n\n", "textIntroEnding": "Dear participant,\n\n",
"textEnding": "Today ends the learning-phase of the cardset ", "textEnding": "Today ends the learning-phase of the cardset ",
"subjectReset": "THMcards: Your learning-progress is going to be resetted for the cardset ", "subjectReset": "THM.cards: Your learning-progress is going to be resetted for the cardset ",
"textReset": "your learning-progress has been resetted due to inactivity. ", "textReset": "your learning-progress has been resetted due to inactivity. ",
"mailCard": "the cardset ", "mailCard": "the cardset ",
"mailCard1": " needs your attention!\n\n", "mailCard1": " needs your attention!\n\n",
...@@ -1073,15 +1073,15 @@ ...@@ -1073,15 +1073,15 @@
"textDate2": " to work on your active cards. Otherwise your learning progress will be resetted!", "textDate2": " to work on your active cards. Otherwise your learning progress will be resetted!",
"subjectSingular3": " is.\n\n", "subjectSingular3": " is.\n\n",
"subjectPlural3": " are.\n\n", "subjectPlural3": " are.\n\n",
"service": "This newsletter is a Service from THMcards. You are receiving this email, because you signed up at ", "service": "This newsletter is a Service from THM.cards. You are receiving this email, because you signed up at ",
"unsubscribe": "Not interested anymore? To unsubscribe stop the current learning phase.", "unsubscribe": "Not interested anymore? To unsubscribe stop the current learning phase.",
"copyright": "© 2017 THMcards", "copyright": "© 2017 THM.cards",
"my-cardset": "My Cardset", "my-cardset": "My Cardset",
"auto-generated": "Please don't reply to this mail. It was automatically generated." "auto-generated": "Please don't reply to this mail. It was automatically generated."
}, },
"footer": { "footer": {
"language": "Choose a language", "language": "Choose a language",
"info": "About THMcards", "info": "About THM.cards",
"connection": "Connection Status" "connection": "Connection Status"
}, },
"language": { "language": {
......
...@@ -22,7 +22,7 @@ var initTestNotificationsCardset = function () { ...@@ -22,7 +22,7 @@ var initTestNotificationsCardset = function () {
{ {
"_id": "NotificationsTestCardset", "_id": "NotificationsTestCardset",
"name": "Notifications Test", "name": "Notifications Test",
"description": "This cardset tests the E-Mail and web notifications of THMCards.", "description": "This cardset tests the E-Mail and web notifications of THM.cards.",
"date": (new Date().setFullYear(2017, 9, 5)), "date": (new Date().setFullYear(2017, 9, 5)),
"dateUpdated": (new Date().setFullYear(2017, 9, 5)), "dateUpdated": (new Date().setFullYear(2017, 9, 5)),
"owner": "NotificationsTestUser", "owner": "NotificationsTestUser",
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<div id="footer" class="footer"> <div id="footer" class="footer">
<div class="container"> <div class="container">
<p class="muted credit pull-left">&copy; {{getYear}} THMcards</p> <p class="muted credit pull-left">&copy; {{getYear}} THM.cards</p>
<p class="muted credit pull-right"><a id="agb" href="{{pathFor route='agb'}}">{{_ "footer.agb"}}</a></p> <p class="muted credit pull-right"><a id="agb" href="{{pathFor route='agb'}}">{{_ "footer.agb"}}</a></p>
<p class="muted credit pull-right"><a id="datenschutz" href="{{pathFor route='datenschutz'}}">{{_ <p class="muted credit pull-right"><a id="datenschutz" href="{{pathFor route='datenschutz'}}">{{_
"contact.datenschutz"}}</a></p> "contact.datenschutz"}}</a></p>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="{{pathFor route='home'}}"> <a class="navbar-brand" href="{{pathFor route='home'}}">
<img src="/img/logo.png" alt="THMcards Logo"/> <img src="/img/logo.png" alt="THM.cards Logo"/>
</a> </a>
</div> </div>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="{{pathFor route='home'}}"> <a class="navbar-brand" href="{{pathFor route='home'}}">
<img src="/img/logo.png" alt="THMcards Logo"/> <img src="/img/logo.png" alt="THM.cards Logo"/>
</a> </a>
</div> </div>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="{{pathFor route='home'}}"> <a class="navbar-brand" href="{{pathFor route='home'}}">
<img src="/img/logo.png" alt="THMcards Logo"/> <img src="/img/logo.png" alt="THM.cards Logo"/>
</a> </a>
</div> </div>
......
...@@ -117,15 +117,6 @@ ...@@ -117,15 +117,6 @@
{{/if}} {{/if}}
{{_ "card.cardType0.name"}} {{_ "card.cardType0.name"}}
</label> </label>
<label id="cardType2" class="col-xs-6 col-sm-2 btn btn-default btn-white {{#if isCardType 2}}active{{/if}}"
data-type="2">
{{#if isCardType 2}}
<input type="radio" id="tabFocus" name="cardType" value="2" checked tabindex="2" data-type="2">
{{else}}
<input type="radio" name="cardType" value="2" data-type="2">
{{/if}}
{{_ "card.cardType2.name"}}
</label>
<label id="cardType3" class="col-xs-6 col-sm-3 btn btn-default btn-white {{#if isCardType 3}}active{{/if}}" <label id="cardType3" class="col-xs-6 col-sm-3 btn btn-default btn-white {{#if isCardType 3}}active{{/if}}"
data-type="3"> data-type="3">
{{#if isCardType 3}} {{#if isCardType 3}}
...@@ -135,16 +126,6 @@ ...@@ -135,16 +126,6 @@
{{/if}} {{/if}}
{{_ "card.cardType3.name"}} {{_ "card.cardType3.name"}}
</label> </label>
<label id="cardType1" class="col-xs-6 col-sm-2 btn btn-default btn-white {{#if isCardType 1}}active{{/if}}"
data-type="1">
{{#if isCardType 1}}
<input type="radio" id="tabFocus" name="cardType" value="1" checked tabindex="2" data-type="1">
{{else}}
<input type="radio" name="cardType" value="1" data-type="1">
{{/if}}
{{_ "card.cardType1.name"}}
</label>
<label id="cardType4" class="col-xs-6 col-sm-3 btn btn-default btn-white {{#if isCardType 4}}active{{/if}}" <label id="cardType4" class="col-xs-6 col-sm-3 btn btn-default btn-white {{#if isCardType 4}}active{{/if}}"
data-type="4"> data-type="4">
{{#if isCardType 4}} {{#if isCardType 4}}
...@@ -155,6 +136,25 @@ ...@@ -155,6 +136,25 @@
{{/if}} {{/if}}
{{_ "card.cardType4.name"}} {{_ "card.cardType4.name"}}
</label> </label>
<label id="cardType2" class="col-xs-6 col-sm-2 btn btn-default btn-white {{#if isCardType 2}}active{{/if}}"
data-type="2">
{{#if isCardType 2}}
<input type="radio" id="tabFocus" name="cardType" value="2" checked tabindex="2" data-type="2">
{{else}}
<input type="radio" name="cardType" value="2" data-type="2">
{{/if}}
{{_ "card.cardType2.name"}}
</label>
<label id="cardType1" class="col-xs-6 col-sm-2 btn btn-default btn-white {{#if isCardType 1}}active{{/if}}"
data-type="1">
{{#if isCardType 1}}
<input type="radio" id="tabFocus" name="cardType" value="1" checked tabindex="2" data-type="1">
{{else}}
<input type="radio" name="cardType" value="1" data-type="1">
{{/if}}
{{_ "card.cardType1.name"}}
</label>
</div> </div>
</template> </template>
......
This diff is collapsed.
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
<table class="table"> <table class="table">
<tr> <tr>
<td> <td>
<b>{{_ "connection.webSocket"}}:</b> {{_ "connection.webSocket"}}:
{{#if isConnected}} {{_ "connection.connected"}} {{else}} {{_ {{#if isConnected}} {{_ "connection.connected"}} {{else}} {{_
"connection.disconnected"}} {{/if}} "connection.disconnected"}} {{/if}}
</td> </td>
......
...@@ -694,7 +694,7 @@ th { ...@@ -694,7 +694,7 @@ th {
} }
#contentEditor::placeholder { #contentEditor::placeholder {
font-size: 28px; font-size: 20px;
text-align: center; text-align: center;
padding-top: 10%; padding-top: 10%;
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<span class="color-THM logo-header-chars logo-header-beginning">THM</span> <span class="color-THM logo-header-chars logo-header-beginning">THM</span>
<span class="color-dot logo-header-dot"></span> <span class="color-dot logo-header-dot"></span>
<span class="color-cards logo-header-chars">cards<img <span class="color-cards logo-header-chars">cards<img
id="cards-welcome-image" src="/img/welcome_logo.png" height="126px" alt="THMcards Logo" id="cards-welcome-image" src="/img/welcome_logo.png" height="126px" alt="THM.cards Logo"
class="p-b-1 float-right"/> class="p-b-1 float-right"/>
</span> </span>
</div> </div>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<tbody> <tbody>
<tr> <tr>
<td align="left"> <td align="left">
<a href="http://arsnova.cards"><img src="{{url}}/img/cardlogo_welcome.png" alt="THMcards Logo" height="22"></a> <a href="http://arsnova.cards"><img src="{{url}}/img/cardlogo_welcome.png" alt="THM.cards Logo" height="22"></a>
</td> </td>
<td align="right"> <td align="right">
<a href="http://www.thm.de/site/"><img src="https://www.thm.de/_thm/logos/thm.svg" alt="THM Logo" height="22"></a> <a href="http://www.thm.de/site/"><img src="https://www.thm.de/_thm/logos/thm.svg" alt="THM Logo" height="22"></a>
......
...@@ -112,7 +112,7 @@ self.addEventListener('fetch', (event) => { ...@@ -112,7 +112,7 @@ self.addEventListener('fetch', (event) => {
self.addEventListener('push', function (event) { self.addEventListener('push', function (event) {
var payload = event.data ? event.data.text() : 'no payload'; var payload = event.data ? event.data.text() : 'no payload';
event.waitUntil( event.waitUntil(
self.registration.showNotification('THMcards', { self.registration.showNotification('THM.cards', {
body: payload, body: payload,
icon: '/img/webpush_icon.png' icon: '/img/webpush_icon.png'
}) })
......
{ {
"name": "THMcards", "name": "THM.cards",
"short_name": "THMcards", "short_name": "THM.cards",
"description": "The ultimate app for learning with cards!", "description": "The ultimate app for learning with cards!",
"icons": [ "icons": [
{ {
......
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