From 0b968abfe4f8f476ec9157423edf4db8535f593e Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Sun, 1 Nov 2020 17:45:38 +0000 Subject: [PATCH] fix merging conflicts --- Core/src/main/resources/lang/messages_en.json | 142 +++++++++--------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/Core/src/main/resources/lang/messages_en.json b/Core/src/main/resources/lang/messages_en.json index f15ee9e18..aea7b8756 100644 --- a/Core/src/main/resources/lang/messages_en.json +++ b/Core/src/main/resources/lang/messages_en.json @@ -2,12 +2,12 @@ "confirm.expired_confirm": "Confirmation has expired, please run the command again!", "confirm.failed_confirm": "You have no pending actions to confirm!", "confirm.requires_confirm": "Are you sure you wish to execute: ?\nThis cannot be undone! If you are sure: ", - + "move.move_success": "Successfully moved plot.", "move.move_merged": "Merged plots may not be moved. Please unmerge the plot before performing the move.", "move.copy_success": "Successfully copied plot.", "move.requires_unowned": "The location specified is already occupied.", - + "debug.requires_unmerged": "The plot cannot be merged.", "debug.debug_header": " Debug Information\n", "debug.debug_section": ">> &l", @@ -18,11 +18,11 @@ "debug.player_in_debugmode": "Player(s) in debug mode: ", "debug.player_in_debugmode_list": "- \n", "debug.entity_categories": "Entity categories:", - + "set.set_attribute": "Successfully set to .", "area.set_pos2": "You will now set pos2: . Note: The chosen plot size may result in the created area not exactly matching your second position.", - + "web.generating_link": "Processing plot...", "web.generating_link_failed": "Failed to generate download link!", "web.generation_link_success": ">", @@ -31,9 +31,9 @@ "web.load_failed": "Failed to load schematic.", "web.load_list": "To load a schematic, use .", "web.save_success": "Successfully saved!", - + "compass.compass_target": "Successfully targeted plot with your compass.", - + "cluster.cluster_available_args": "The following sub commands are available: list, create, delete, resize, invite, kick, leave, members, info, tp, sethome", "cluster.cluster_list_heading": "There are clusters in this world.", "cluster.cluster_list_element": " - \n", @@ -60,17 +60,17 @@ "cluster.cluster_info": "Current cluster: \nName: \nOwner: \nSize: \nRights: ", "border.border": "You are outside the current map border.", - + "worldedit.worldedit_bypass": "To bypass your restrictions use ", "worldedit.worldedit_bypassed": "Currently bypassing WorldEdit restriction.", - + "gamemode.gamemode_was_bypassed": "You bypassed the gamemode () set for .", - + "height.height_limit": "This plot area has a height limit of .", - + "notification.notify_enter": " entered your plot ().", "notification.notify_leave": " left your plot ().", - + "swap.swap_overlap": "The proposed areas are not allowed to overlap.", "swap.swap_success": "Successfully swapped plots.", "swap.swap_merged": "Merged plots may not be swapped. Please unmerge the plots before performing the swap.", @@ -93,23 +93,23 @@ "comment.comment_removed_failure": "Failed to delete comment!", "comment.comment_added": "A comment has been left.", "comment.inbox_empty": "No comments.", - + "console.not_console": "For safety reasons, this command can only be executed by console.", "console.is_console": "This command can only be executed by a player.", - + "clipboard.paste_failed": "Failed to paste the selection. Reason: ", - + "toggle.toggle_enabled": "Enabled setting: ", "toggle.toggle_disabled": "Disabled setting: ", - + "blockedcmds.command_blocked": "That command is not allowed in this plot.", - + "done.done_already_done": "This plot is already marked as done.", "done.done_not_done": "This plot is not marked as done.", "done.done_insufficient_complexity": "This plot is too simple. Please add more detail before using this command.", "done.done_success": "Successfully marked this plot as done.", "done.done_removed": "You may now continue building in this plot.", - + "ratings.ratings_purged": "Purged ratings for this plot.", "ratings.rating_not_valid": "You need to specify a number between 1 and 10.", "ratings.rating_already_exists": "You have already rated plot .", @@ -119,10 +119,10 @@ "ratings.rating_not_your_own": "You cannot rate your own plot.", "ratings.rating_not_done": "You can only rate finished plots.", "ratings.rating_not_owned": "You cannot rate a plot that is not claimed by anyone.", - + "tutorial.rate_this": "Rate this plot!", "tutorial.comment_this": "Leave some feedback on this plot: .", - + "economy.econ_disabled": "Economy is not enabled.", "economy.cannot_afford_plot": "You cannot afford to buy this plot. It costs .", "economy.not_for_sale": "This plot is not for sale.", @@ -132,7 +132,7 @@ "economy.added_balance": " has been added to your balance.", "economy.removed_balance": " has been taken from your balance.", "economy.removed_granted_plot": "You used plot grant(s), you've got left.", - + "setup.setup_not_started": "No setup started.", "setup.setup_init": "Usage: /plot setup ", "setup.setup_step": "[Step ] - Expecting: Default: ", @@ -158,7 +158,7 @@ "setup.setup_area_max_plot_id": "What should be the maximum Plot ID?", "setup.setup_area_max_plot_id_error": "You must choose a valid maximum Plot ID!", "setup.setup_area_plot_id_greater_than_minimum": "The maximum Plot ID must be greater than the minimum!", - + "plotareatype.plot_area_type_normal": "Standard plot generation", "plotareatype.plot_area_type_augmented": "Plot generation with vanilla terrain", "plotareatype.plot_area_type_partial": "Vanilla with clusters of plots", @@ -177,30 +177,30 @@ "schematics.schematic_exportall_single_finished": "Finished export.", "schematic.schematic_exportall_world": "Invalid world.", "schematics.plot_to_schem": "Plot->Schematic: Found plots...", - + "error.task_in_process": "Task is already running.", - + "titles.title_entered_plot": "Plot: ;;", "titles.title_entered_plot_sub": "Owned by ", "titles.prefix_greeting": ">", "titles.prefix_farewell": ">", - + "core.prefix": "[P2] ", "core.enabled": " is now enabled.", "placeholder.hooked": "PlotSquared hooked into MVdWPlaceholderAPI", - + "reload.reloaded_configs": "Translations and world settings have been reloaded successfully.", "reload.reload_failed": "Failed to reload file configurations.", - + "desc.desc_set": "Plot description set.", "desc.desc_unset": "Plot description unset.", - + "alias.alias_set_to": "Plot alias set to .", "alias.alias_removed": "Plot alias removed.", "alias.alias_too_long": "The alias must have less than 50 characters in length.", "alias.alias_is_taken": "That alias is already taken.", - + "position.position_set": "Home position set to your current location.", "position.position_unset": "Home position reset to the default location.", @@ -212,7 +212,7 @@ "permission.cant_claim_more_clusters": "You can't claim more clusters.", "permission.cant_transfer_more_plots": "You can't send more plots to that user.", "permission.cant_claim_more_plots_num": "You can't claim more than plots at once.", - + "merge.merge_request_confirm": "Merge request from .", "merge.merge_not_valid": "This merge request is no longer valid.", "merge.merge_accepted": "The merge request has been accepted.", @@ -222,7 +222,7 @@ "merge.unlink_impossible": "You can only unlink a mega-plot.", "merge.unmerge_cancelled": "Unlink has been cancelled.", "merge.unlink_success": "Successfully unlinked plots.", - + "commandconfig.not_valid_subcommand": "That is not a valid subcommand.", "commandconfig.did_you_mean": "Did you mean: ", "commandconfig.subcommand_set_options_header": "Possible Values: ", @@ -230,7 +230,7 @@ "commandconfig.command_syntax": "Usage: ", "commandconfig.command_syntax_extended": "Usage: ", "commandconfig.flag_tutorial_usage": "Have an admin set the flag: ", - + "invalid.component_illegal_block": "You are not allowed to generate a component containing the block ", "invalid.not_valid_block": "That's not a valid block: ", "invalid.not_allowed_block": "That block is not allowed: ", @@ -293,7 +293,7 @@ "debugexec.script_list_item": "[] ", "debugexec.analyze_done": "Done. Use for more information. ", - "expiry.expired_options_clicky": " expired: >>\n - >>Delete this ()\n - >>Remind later ()\n - >>Keep this ()\n - >>Don't show me this ()", + "expiry.expired_options_clicky": " expired: >\">\n - >\">Delete this ()\n - >\">Remind later ()\n - >\">Keep this ()\n - >\">Don't show me this ()", "debugimportworlds.single_plot_area": "Must be a single plot area.", "debugimportworlds.world_container": "World container must be configured to be a separate directory to your base files.", @@ -339,37 +339,37 @@ "debugsavetest.starting": "Starting debugsavetest.", "debugsavetest.done": "Database sync finished.", - + "purge.purge_success": "Successfully purged plots.", - + "players.fetching_player": "PlotSquared is attempting to find the specified player from your argument(s). This may take a while.", "players.fetching_players_timeout": "The specified users did not exist in the cache and will be fetched in the background. Please wait a couple of minutes.", - + "trim.trim_in_progress": "A world trim task is already in progress!", "trim.trim_done": "Trim done.", "trim.trim_starting": "Collecting region data...", "blocklist.block_list_separator": ", ", - + "biome.need_biome": "You need to specify a valid biome.", "biome.biome_set_to": "Plot biome set to ", - + "teleport.teleported_to_plot": "You have been teleported.", "teleport.teleported_to_road": "You got teleported to the road.", "teleport.teleport_in_seconds": "Teleporting in seconds. Do not move...", "teleport.teleport_failed": "Teleportation cancelled due to movement or damage.", - + "setblock.set_block_action_finished": "The last setblock action is now finished.", - + "unsafe.debugallowunsafe_on": "Unsafe actions enabled.", "unsafe.debugallowunsafe_off": "Unsafe actions disabled.", - + "need.need_block": "You've got to specify a block.", - + "near.plot_near": "Players: ", "scripts.script_list": "--------- SCRIPTS ---------", - + "info.none": "None", "info.now": "Now", "info.never": "Never", @@ -380,16 +380,16 @@ "info.plot_info_unclaimed": "Plot is not yet claimed.", "info.plot_info_header": "--------- INFO ---------", "info.plot_info_hidden": "You cannot view the information about this plot.", - "info.plot_info_format": "
\nID: \nArea: \nAlias:\nOwner:\nBiome: \nCan Build: \nRating: \nSeen: \nTrusted:\nMembers:\nDenied:\nFlags:\nDescription: \n