Skip to content

Commit

Permalink
Merge #3028 Consider supports in recommendations screen descriptions
Browse files Browse the repository at this point in the history
  • Loading branch information
HebaruSan committed Apr 23, 2020
2 parents 54621ff + 8b3b1c1 commit 952f052
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 14 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file.
- [Core] Treat metapackage depends as not auto installed (#3008 by: HebaruSan; reviewed: DasSkelett)
- [GUI] Improve modpack identifier validation (#3025 by: HebaruSan; reviewed: DasSkelett)
- [GUI] Disable reinstall option for AD mods (#3034 by: HebaruSan; reviewed: DasSkelett)
- [GUI] Consider supports in recommendations screen descriptions (#3028 by: HebaruSan; reviewed: DasSkelett)

### Internal

Expand Down
8 changes: 4 additions & 4 deletions GUI/Controls/ChooseRecommendedMods.resx
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,12 @@
</resheader>
<data name="RecommendedModsCancelButton.Text" xml:space="preserve"><value>Cancel</value></data>
<data name="RecommendedModsContinueButton.Text" xml:space="preserve"><value>Continue</value></data>
<data name="RecommendedModsToggleCheckbox.Text" xml:space="preserve"><value>(De-)select all recommended or suggested mods</value></data>
<data name="RecommendedDialogLabel.Text" xml:space="preserve"><value>The following modules have been recommended or suggested by one or more of the chosen modules:</value></data>
<data name="RecommendedModsToggleCheckbox.Text" xml:space="preserve"><value>(De-)select all</value></data>
<data name="RecommendedDialogLabel.Text" xml:space="preserve"><value>The chosen modules recommend, suggest, or are supported by the following modules:</value></data>
<data name="RecommendationsGroup.Header" xml:space="preserve"><value>Recommendations</value></data>
<data name="SuggestionsGroup.Header" xml:space="preserve"><value>Suggestions</value></data>
<data name="SupportedByGroup.Header" xml:space="preserve"><value>Supported By</value></data>
<data name="SupportedByGroup.Header" xml:space="preserve"><value>Supported By (not endorsed by chosen mods)</value></data>
<data name="ModNameHeader.Text" xml:space="preserve"><value>Mod</value></data>
<data name="SourceModulesHeader.Text" xml:space="preserve"><value>Recommended or suggested by:</value></data>
<data name="SourceModulesHeader.Text" xml:space="preserve"><value>Related mod</value></data>
<data name="DescriptionHeader.Text" xml:space="preserve"><value>Mod description</value></data>
</root>
8 changes: 4 additions & 4 deletions GUI/Localization/de-DE/ChooseRecommendedMods.de-DE.resx
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@
</resheader>
<data name="RecommendedModsCancelButton.Text" xml:space="preserve"><value>Abbrechen</value></data>
<data name="RecommendedModsContinueButton.Text" xml:space="preserve"><value>Fortsetzen</value></data>
<data name="RecommendedModsToggleCheckbox.Text" xml:space="preserve"><value>Alle Empfehlungen und Vorschläge ab-/auswählen</value></data>
<data name="RecommendedDialogLabel.Text" xml:space="preserve"><value>Die folgenden Module wurden von mindestens einer ausgewählten Mod empfohlen oder vorgeschlagen</value></data>
<data name="RecommendedModsToggleCheckbox.Text" xml:space="preserve"><value>Alles ab-/auswählen</value></data>
<data name="RecommendedDialogLabel.Text" xml:space="preserve"><value>Die ausgewählten Module empfehlen oder schlagen folgende Module vor, oder eines der ausgewählten Module wird werden von einem der folgenden unterstützt.</value></data>
<data name="RecommendationsGroup.Header" xml:space="preserve"><value>Empfehlungen</value></data>
<data name="SuggestionsGroup.Header" xml:space="preserve"><value>Vorschläge</value></data>
<data name="SupportedByGroup.Header" xml:space="preserve"><value>Unterstützt durch</value></data>
<data name="SourceModulesHeader.Text" xml:space="preserve"><value>Empfohlen/vorgeschlagen von:</value></data>
<data name="SupportedByGroup.Header" xml:space="preserve"><value>Unterstützt durch (nicht befürwortet von den ausgewählten Mods)</value></data>
<data name="SourceModulesHeader.Text" xml:space="preserve"><value>Zugehörige Mod</value></data>
<data name="DescriptionHeader.Text" xml:space="preserve"><value>Kurzbeschreibung</value></data>
</root>
2 changes: 1 addition & 1 deletion GUI/Localization/de-DE/Main.de-DE.resx
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
<data name="ChangesetTabPage.Text" xml:space="preserve"><value>Änderungen</value></data>
<data name="WaitTabPage.Text" xml:space="preserve"><value>Statuslog</value></data>
<data name="ChooseProvidedModsTabPage.Text" xml:space="preserve"><value>Wähle Mods</value></data>
<data name="ChooseRecommendedModsTabPage.Text" xml:space="preserve"><value>Wähle Empfehlungen und Vorschläge aus</value></data>
<data name="ChooseRecommendedModsTabPage.Text" xml:space="preserve"><value>Auswahl von Empfehlungen, Vorschlägen und unterstützenden Mods</value></data>
<data name="EditModpackTabPage.Text" xml:space="preserve"><value>Modpack bearbeiten</value></data>
<data name="updatesToolStripMenuItem.Text" xml:space="preserve"><value>N verfügbare Updates</value></data>
<data name="refreshToolStripMenuItem.Text" xml:space="preserve"><value>Aktualisieren</value></data>
Expand Down
2 changes: 1 addition & 1 deletion GUI/Main/Main.resx
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
<data name="ChangesetTabPage.Text" xml:space="preserve"><value>Changeset</value></data>
<data name="WaitTabPage.Text" xml:space="preserve"><value>Status log</value></data>
<data name="ChooseProvidedModsTabPage.Text" xml:space="preserve"><value>Choose mods</value></data>
<data name="ChooseRecommendedModsTabPage.Text" xml:space="preserve"><value>Choose recommended or suggested mods</value></data>
<data name="ChooseRecommendedModsTabPage.Text" xml:space="preserve"><value>Choose recommended, suggested, or supporting mods</value></data>
<data name="DeleteDirectoriesTabPage.Text" xml:space="preserve"><value>Delete Directories</value></data>
<data name="EditModpackTabPage.Text" xml:space="preserve"><value>Edit Modpack</value></data>
<data name="minimizeNotifyIcon.Text" xml:space="preserve"><value>CKAN</value></data>
Expand Down
4 changes: 2 additions & 2 deletions GUI/Properties/Resources.de-DE.resx
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@ Wenn du ein Fehler mit dem CKAN Client vermutest: https://github.com/KSP-CKAN/CK
<data name="MainModListAll" xml:space="preserve"><value>Alle ({0})</value></data>
<data name="MainModListUpdatingTray" xml:space="preserve"><value>Aktualisiere Taskleiste...</value></data>
<data name="MainModListUnknownFilter" xml:space="preserve"><value>Unbekannter Filtertyp {0} in IsModInFilter</value></data>
<data name="MainRecommendationsTitle" xml:space="preserve"><value>Wähle empfohlene oder vorgeschlagene Mods aus.</value></data>
<data name="MainRecommendationsNoneFound" xml:space="preserve"><value>Keine Empfehlungen oder Vorschläge gefunden.</value></data>
<data name="MainRecommendationsTitle" xml:space="preserve"><value>Auswahl von Empfehlungen, Vorschlägen und unterstützenden Mods</value></data>
<data name="MainRecommendationsNoneFound" xml:space="preserve"><value>Keine Empfehlungen, Vorschläge oder unterstützende Mods gefunden.</value></data>
<data name="MainRepoWaitTitle" xml:space="preserve"><value>Aktualisiere Repository</value></data>
<data name="MainRepoScanning" xml:space="preserve"><value>Suche nach DLCs und manuell installierten Modulen...</value></data>
<data name="MainRepoContacting" xml:space="preserve"><value>Kontaktiere das Repository...</value></data>
Expand Down
4 changes: 2 additions & 2 deletions GUI/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,8 @@ If you suspect a bug in the client: https://github.com/KSP-CKAN/CKAN/issues/new/
<data name="MainModListUpdatingTray" xml:space="preserve"><value>Updating tray...</value></data>
<data name="MainModListAutoDetected" xml:space="preserve"><value>AD</value></data>
<data name="MainModListUnknownFilter" xml:space="preserve"><value>Unknown filter type {0} in IsModInFilter</value></data>
<data name="MainRecommendationsTitle" xml:space="preserve"><value>Choose recommended or suggested mods</value></data>
<data name="MainRecommendationsNoneFound" xml:space="preserve"><value>No recommendations or suggestions found.</value></data>
<data name="MainRecommendationsTitle" xml:space="preserve"><value>Choose recommended, suggested, or supporting mods</value></data>
<data name="MainRecommendationsNoneFound" xml:space="preserve"><value>No recommended, suggested, or supporting mods found.</value></data>
<data name="MainRepoWaitTitle" xml:space="preserve"><value>Updating repositories</value></data>
<data name="MainRepoScanning" xml:space="preserve"><value>Scanning for DLCs and manually installed modules...</value></data>
<data name="MainRepoContacting" xml:space="preserve"><value>Contacting repository...</value></data>
Expand Down

0 comments on commit 952f052

Please sign in to comment.