Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove leftover bits from the campaign export removal #4616

Merged
merged 3 commits into from
Jan 6, 2024
Merged

Remove leftover bits from the campaign export removal #4616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f92e59
Fix i18n string for campaign repository export
kwvanderlinde Jan 3, 2024
64b1d64
Remove i18n strings for removed campaign exports
kwvanderlinde Jan 3, 2024
8870199
Remove unused campaignExportDialog.xml
kwvanderlinde Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/net/rptools/maptool/client/AppActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ protected void executeAction() {
return;
}

MapTool.showInformation("msg.confirm.campaignExported");
MapTool.showInformation("msg.confirm.campaignRepoExported");
}
};

Expand Down
815 changes: 0 additions & 815 deletions src/main/resources/net/rptools/maptool/client/ui/forms/campaignExportDialog.xml
View file
Open in desktop

This file was deleted.

11 changes: 1 addition & 10 deletions src/main/resources/net/rptools/maptool/language/i18n.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,6 @@ Update.msg2 = Would you like to download {0}?
Update.button = Skip this Version
Update.chkbox = Never check for updates again!

ExportCampaign.desc = Export campaign to a previous version

ExportScreenshot.view.current.tooltip = What you see is what you get.
ExportScreenshot.view.asselected = As Selected
ExportScreenshot.view.asselected.tooltip = Pick which layers to include in the screenshot.
Expand Down Expand Up @@ -1283,8 +1281,6 @@ action.error.noMapBoard = There is no map image. Use "Edit
# hard-coded in the application, but that's OSX for you. ;-)
action.exit = E&xit
action.exit.description = Exit out of MapTool.
action.exportCampaignAs = Campaign As...
action.exportCampaignAs.description = Export current campaign to a version compatible with older MapTool releases.
action.exportScreenShot = Screenshot
action.exportScreenShot.title = Export Screenshot
action.exportScreenShot.accel = shift S
Expand Down Expand Up @@ -1657,11 +1653,6 @@ dialog.addresource.warn.musthavename = Must supply a name for th
dialog.addresource.warn.mustselectone = Must select at least one library to download
dialog.addresource.error.malformedurl = Artpack URL {0} is malformed. Please check your installation.
dialog.addresource.warn.badresourceid = Bad resource identifier: {0}. Report error to MapTool team.
dialog.campaignExport.notes.version.1.4.0.0 = Exporting to this version will strip out any drawables and any campaign settings for <b>Lumens</b>.<br>Tokens with <b>VBL</b> will loose this functionality as well as any <i>Always Visible</i> values.<br><b>Merged Drawings</b> will still be present but their label in Draw Explorer will not show as normal.<br><br><i>Note: Macros will remain unchanged, so any reference to newer functionality not available in this version will cause normal errors when ran.</i>
dialog.campaignExport.notes.version.1.4.0.1 = Exporting to this version will strip out any campaign settings for <b>Lumens</b>.<br>Tokens with <b>VBL</b> will loose this functionality as well as any <i>Always Visible</i> values.<br><b>Merged Drawings</b> will still be present but their label in Draw Explorer will not show as normal.<br><br><i>Note: Macros will remain unchanged, so any reference to newer functionality not available in this version will cause normal errors when ran.</i>
dialog.campaignExport.notes.version.1.4.1..1.5.0 = Exporting to this version will make sure the former format of the content.xml inside the campaign file is kept and the unitsPerCell value for zones/maps is an integer (vs. double in the newer versions).
dialog.campaignExport.notes.version.1.5.1 = Exporting to this version will make sure the former format of the content.xml inside the campaign file is kept.
dialog.campaignexport.error.invalidversion = Unable to export, an invalid version number was detected.
dialog.colorChooser.title = Choose Color
dialog.copyZone.msg = New map name:
# {0} is the current map name
Expand Down Expand Up @@ -2125,7 +2116,7 @@ msg.commandPanel.cheater.gm = {0} was caught <i>cheating</i>:
msg.commandPanel.div = Unexpected &lt;/div&gt; tag without matching &lt;div&gt;.
msg.confirm.aboutToBeginFTP = About to begin FTP process of {0,number} file(s)...
msg.confirm.bootPlayer = Are you sure you want to boot {0}?
msg.confirm.campaignExported = Campaign exported.
msg.confirm.campaignRepoExported = Campaign repository exported.
msg.confirm.clearAllDrawings = <html>This will clear all drawings on layer <b>{0}</b> and completely empty the undo queue for <b>ALL</b> layers.<br>This cannot be undone. Are you sure?
msg.confirm.deleteDraw = Are you sure you want to delete the selected drawings?
msg.confirm.deleteDraw.removed = This will no longer ask for permission when deleting drawing. If you want to turn this back on look in Preferences.
Expand Down
8 changes: 0 additions & 8 deletions src/main/resources/net/rptools/maptool/language/i18n_ach.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,6 @@ action.error.noMapBoard = crwdns322\:0crwdne322\:0
# hard-coded in the application, but that's OSX for you. ;-)
action.exit = crwdns324\:0crwdne324\:0
action.exit.description = crwdns2093\:0crwdne2093\:0
action.exportCampaignAs = crwdns326\:0crwdne326\:0
action.exportCampaignAs.description = crwdns2095\:0crwdne2095\:0
action.exportScreenShot = crwdns328\:0crwdne328\:0
action.exportScreenShot.accel = crwdns330\:0crwdne330\:0
action.exportScreenShot.description = crwdns2097\:0crwdne2097\:0
Expand Down Expand Up @@ -632,11 +630,6 @@ dialog.addresource.warn.invalidurl = crwdns828\:0{0}crwdne828\
dialog.addresource.warn.musthavename = crwdns830\:0crwdne830\:0
dialog.addresource.warn.mustselectone = crwdns832\:0crwdne832\:0
dialog.addresource.warn.badresourceid = crwdns834\:0{0}crwdne834\:0
dialog.campaignExport.notes.version.1.4.0.0 = crwdns836\:0crwdne836\:0
dialog.campaignExport.notes.version.1.4.0.1 = crwdns838\:0crwdne838\:0
dialog.campaignExport.notes.version.1.4.1..1.5.0 = crwdns840\:0crwdne840\:0
dialog.campaignExport.notes.version.1.5.1 = crwdns842\:0crwdne842\:0
dialog.campaignexport.error.invalidversion = crwdns844\:0crwdne844\:0
dialog.resizeStamp.checkbox.horizontal.anchor = crwdns846\:0crwdne846\:0
dialog.resizeStamp.checkbox.vertical.anchor = crwdns848\:0crwdne848\:0
dialog.resizeStamp.label.height = crwdns850\:0crwdne850\:0
Expand Down Expand Up @@ -1019,7 +1012,6 @@ msg.commandPanel.hasEnteredText = crwdns1356\:0{0}crwdne1356\:0
msg.commandPanel.liveTyping = crwdns1358\:0{0}crwdne1358\:0
msg.confirm.aboutToBeginFTP = crwdns1360\:00\={0}crwdne1360\:0
msg.confirm.bootPlayer = crwdns1362\:0{0}crwdne1362\:0
msg.confirm.campaignExported = crwdns1364\:0crwdne1364\:0
msg.confirm.clearAllDrawings = crwdns1366\:0{0}crwdne1366\:0
msg.confirm.deleteDraw = crwdns1368\:0crwdne1368\:0
msg.confirm.deleteDraw.removed = crwdns1370\:0crwdne1370\:0
Expand Down
10 changes: 0 additions & 10 deletions src/main/resources/net/rptools/maptool/language/i18n_cs.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,6 @@ Update.msg2 = Would you like to download {0}?
Update.button = Skip this Version
Update.chkbox = Never check for updates again\!

ExportCampaign.desc = Export campaign to a previous version

ExportScreenshot.view.current.tooltip = What you see is what you get.
ExportScreenshot.view.asselected = As Selected
ExportScreenshot.view.asselected.tooltip = Pick which layers to include in the screenshot.
Expand Down Expand Up @@ -1147,8 +1145,6 @@ action.error.noMapBoard = There is no map image. Use "Edit
# hard-coded in the application, but that's OSX for you. ;-)
action.exit = E&xit
action.exit.description = Exit out of MapTool.
action.exportCampaignAs = Campaign As...
action.exportCampaignAs.description = Export current campaign to a version compatible with older MapTool releases.
action.exportScreenShot = Screenshot
action.exportScreenShot.title = Export Screenshot
action.exportScreenShot.accel = shift S
Expand Down Expand Up @@ -1521,11 +1517,6 @@ dialog.addresource.warn.musthavename = Must supply a name for th
dialog.addresource.warn.mustselectone = Must select at least one library to download
dialog.addresource.error.malformedurl = Artpack URL {0} is malformed. Please check your installation.
dialog.addresource.warn.badresourceid = Bad resource identifier\: {0}. Report error to MapTool team.
dialog.campaignExport.notes.version.1.4.0.0 = Exporting to this version will strip out any drawables and any campaign settings for <b>Lumens</b>.<br>Tokens with <b>VBL</b> will loose this functionality as well as any <i>Always Visible</i> values.<br><b>Merged Drawings</b> will still be present but their label in Draw Explorer will not show as normal.<br><br><i>Note\: Macros will remain unchanged, so any reference to newer functionality not available in this version will cause normal errors when ran.</i>
dialog.campaignExport.notes.version.1.4.0.1 = Exporting to this version will strip out any campaign settings for <b>Lumens</b>.<br>Tokens with <b>VBL</b> will loose this functionality as well as any <i>Always Visible</i> values.<br><b>Merged Drawings</b> will still be present but their label in Draw Explorer will not show as normal.<br><br><i>Note\: Macros will remain unchanged, so any reference to newer functionality not available in this version will cause normal errors when ran.</i>
dialog.campaignExport.notes.version.1.4.1..1.5.0 = Exporting to this version will make sure the former format of the content.xml inside the campaign file is kept and the unitsPerCell value for zones/maps is an integer (vs. double in the newer versions).
dialog.campaignExport.notes.version.1.5.1 = Exporting to this version will make sure the former format of the content.xml inside the campaign file is kept.
dialog.campaignexport.error.invalidversion = Unable to export, an invalid version number was detected.
dialog.colorChooser.title = Choose Color
dialog.copyZone.msg = New map name\:
# {0} is the current map name
Expand Down Expand Up @@ -1989,7 +1980,6 @@ msg.commandPanel.cheater.gm = {0} was caught <i>cheating</i>\:
msg.commandPanel.div = Unexpected &lt;/div&gt; tag without matching &lt;div&gt;.
msg.confirm.aboutToBeginFTP = About to begin FTP process of {0,number} file(s)...
msg.confirm.bootPlayer = Are you sure you want to boot {0}?
msg.confirm.campaignExported = Campaign exported.
msg.confirm.clearAllDrawings = <html>This will clear all drawings on layer <b>{0}</b> and completely empty the undo queue for <b>ALL</b> layers.<br>This cannot be undone. Are you sure?
msg.confirm.deleteDraw = Are you sure you want to delete the selected drawings?
msg.confirm.deleteDraw.removed = This will no longer ask for permission when deleting drawing. If you want to turn this back on look in Preferences.
Expand Down
10 changes: 0 additions & 10 deletions src/main/resources/net/rptools/maptool/language/i18n_da.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,6 @@ Update.msg2 = Would you like to download {0}?
Update.button = Spring denne version over
Update.chkbox = Never check for updates again\!

ExportCampaign.desc = Export campaign to a previous version

ExportScreenshot.view.current.tooltip = Det du ser, er det du får.
ExportScreenshot.view.asselected = Som valgt
ExportScreenshot.view.asselected.tooltip = Pick which layers to include in the screenshot.
Expand Down Expand Up @@ -1147,8 +1145,6 @@ action.error.noMapBoard = There is no map image. Use "Edit
# hard-coded in the application, but that's OSX for you. ;-)
action.exit = &Afslut
action.exit.description = Afslut MapTool.
action.exportCampaignAs = Kampagne som...
action.exportCampaignAs.description = Export current campaign to a version compatible with older MapTool releases.
action.exportScreenShot = Skærmbillede
action.exportScreenShot.title = Eksporter Skærmbillede
action.exportScreenShot.accel = shift S
Expand Down Expand Up @@ -1521,11 +1517,6 @@ dialog.addresource.warn.musthavename = Must supply a name for th
dialog.addresource.warn.mustselectone = Vælge mindst ét bibliotek til download
dialog.addresource.error.malformedurl = Artpack URL {0} is malformed. Please check your installation.
dialog.addresource.warn.badresourceid = Bad resource identifier\: {0}. Report error to MapTool team.
dialog.campaignExport.notes.version.1.4.0.0 = Exporting to this version will strip out any drawables and any campaign settings for <b>Lumens</b>.<br>Tokens with <b>VBL</b> will loose this functionality as well as any <i>Always Visible</i> values.<br><b>Merged Drawings</b> will still be present but their label in Draw Explorer will not show as normal.<br><br><i>Note\: Macros will remain unchanged, so any reference to newer functionality not available in this version will cause normal errors when ran.</i>
dialog.campaignExport.notes.version.1.4.0.1 = Exporting to this version will strip out any campaign settings for <b>Lumens</b>.<br>Tokens with <b>VBL</b> will loose this functionality as well as any <i>Always Visible</i> values.<br><b>Merged Drawings</b> will still be present but their label in Draw Explorer will not show as normal.<br><br><i>Note\: Macros will remain unchanged, so any reference to newer functionality not available in this version will cause normal errors when ran.</i>
dialog.campaignExport.notes.version.1.4.1..1.5.0 = Exporting to this version will make sure the former format of the content.xml inside the campaign file is kept and the unitsPerCell value for zones/maps is an integer (vs. double in the newer versions).
dialog.campaignExport.notes.version.1.5.1 = Exporting to this version will make sure the former format of the content.xml inside the campaign file is kept.
dialog.campaignexport.error.invalidversion = Unable to export, an invalid version number was detected.
dialog.colorChooser.title = Vælg farve
dialog.copyZone.msg = Nyt kortnavn\:
# {0} is the current map name
Expand Down Expand Up @@ -1989,7 +1980,6 @@ msg.commandPanel.cheater.gm = {0} was caught <i>cheating</i>\:
msg.commandPanel.div = Unexpected &lt;/div&gt; tag without matching &lt;div&gt;.
msg.confirm.aboutToBeginFTP = About to begin FTP process of {0,number} file(s)...
msg.confirm.bootPlayer = Are you sure you want to boot {0}?
msg.confirm.campaignExported = Kampagne eksporteret.
msg.confirm.clearAllDrawings = <html>This will clear all drawings on layer <b>{0}</b> and completely empty the undo queue for <b>ALL</b> layers.<br>This cannot be undone. Are you sure?
msg.confirm.deleteDraw = Are you sure you want to delete the selected drawings?
msg.confirm.deleteDraw.removed = This will no longer ask for permission when deleting drawing. If you want to turn this back on look in Preferences.
Expand Down
10 changes: 0 additions & 10 deletions src/main/resources/net/rptools/maptool/language/i18n_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,6 @@ Update.msg2 = Möchten Sie {0} herunterladen?
Update.button = Diese Version überspringen
Update.chkbox = Überprüfe nie mehr auf Updates\!

ExportCampaign.desc = Kampagne in eine vorherige Version exportieren

ExportScreenshot.view.current.tooltip = Wie gesehen, ohne Nebenabsprachen.
ExportScreenshot.view.asselected = Wie ausgewählt
ExportScreenshot.view.asselected.tooltip = Wähle aus, welche Schichten im Bildschirmfoto aufgenommen werden sollen.
Expand Down Expand Up @@ -1147,8 +1145,6 @@ action.error.noMapBoard = Es gibt kein Kartenbild. Benutze
# hard-coded in the application, but that's OSX for you. ;-)
action.exit = Beenden (&X)
action.exit.description = Beende MapTool.
action.exportCampaignAs = Exportiere Kampagne unter...
action.exportCampaignAs.description = Exportiert die aktuelle Kampagne in einem mit älteren MapTool-Versionen kompatiblen Format.
action.exportScreenShot = Bildschirmfoto
action.exportScreenShot.title = Screenshot exportieren
action.exportScreenShot.accel = shift S
Expand Down Expand Up @@ -1521,11 +1517,6 @@ dialog.addresource.warn.musthavename = Es muss ein Name für die
dialog.addresource.warn.mustselectone = Es muss mindestens eine Bibliothek zum Herunterladen ausgewählt werden
dialog.addresource.error.malformedurl = Artpack-URL {0} ist fehlerhaft. Bitte Installation überprüfen.
dialog.addresource.warn.badresourceid = Ungültige Ressourcenkennung\: {0}. Melden Sie den Fehler an das MapTool-Team.
dialog.campaignExport.notes.version.1.4.0.0 = Beim Export in diese Version werden alle Zeichnungen und Kampagneneinstellungen für <b>Lumens</b> entfernt.<br><b>VBL</b> und <i>Immer sichtbar</i> bei Spielmarken geht verloren.<br><b>Verbundene Zeichnungen</b> bleiben bestehen, aber ihre Beschriftung im Draw Explorer wird nicht normal dargestellt.<br><br><i>Hinweis\: Makros bleiben unverändert. Die Verwendung von Funktionen, die in jener Version noch nicht zur Verfügung standen, werden daher entsprechende Fehler verursachen.</i>
dialog.campaignExport.notes.version.1.4.0.1 = Beim Export in diese Version werden alle Kampagneneinstellungen für <b>Lumens</b> entfernt.<br><b>VBL</b> und <i>Immer sichtbar</i> bei Spielmarken geht verloren.<br><b>Verbundene Zeichnungen</b> bleiben bestehen, aber ihre Beschriftung im Draw Explorer wird nicht normal dargestellt.<br><br><i>Hinweis\: Makros bleiben unverändert. Die Verwendung von Funktionen, die in jener Version noch nicht zur Verfügung standen, werden daher entsprechende Fehler verursachen.</i>
dialog.campaignExport.notes.version.1.4.1..1.5.0 = Durch den Export in diese Version wird das vorherige Format von content.ml in der Kampagnendatei beibehalten und der unitsPerCell Wert für Zonen/Karten ist eine Ganzzahl (gegenüber double in den neueren Versionen).
dialog.campaignExport.notes.version.1.5.1 = Durch den Export in diese Version wird sichergestellt, dass das vorherige Format von content.xml in der Kampagnendatei erhalten bleibt.
dialog.campaignexport.error.invalidversion = Kann nicht zu exportieren, wurde eine ungültige Versionsnummer erkannt.
dialog.colorChooser.title = Farbe wählen
dialog.copyZone.msg = Name der neuen Karte\:
# {0} is the current map name
Expand Down Expand Up @@ -1989,7 +1980,6 @@ msg.commandPanel.cheater.gm = {0} wurde beim <i>Schummeln</i>
msg.commandPanel.div = Unerwartetes &lt;/div&gt; ohne vorhergehendes &lt;div&gt;.
msg.confirm.aboutToBeginFTP = Starte FTP Prozeß von {0,number} Datei(en)...
msg.confirm.bootPlayer = Bist Du sicher, daß Du {0} hinauswerfen möchtest?
msg.confirm.campaignExported = Kampagne exportiert.
msg.confirm.clearAllDrawings = <html>Dies löscht alle Zeichnungen auf der Ebene <b>{0}</b> und leert den Verlauf der "Rückgängig"-Aktionen <b>ALLER</b> Ebenen.<br>Dies kann nicht rückgängig gemacht werden. Bist Du sicher?
msg.confirm.deleteDraw = Sollen die ausgewählten Zeichnungen wirklich gelöscht werden?
msg.confirm.deleteDraw.removed = Das Programm wird nicht erneut um Erlaubnis zum Löschen von Zeichnungen fragen. Um dies rückgängig zu machen, schau in die Einstellungen.
Expand Down
Loading
Loading