Merge upstream main and resolve conflicts in nix-monitor
This commit is contained in:
@@ -1,84 +1,156 @@
|
||||
{
|
||||
"bar.checking": "Checking...",
|
||||
"bar.update_available": "Update available!",
|
||||
"bar.up_to_date": "Up to date",
|
||||
"bar.unknown": "Unknown",
|
||||
"notification.checking_update": "Checking NixOS update...",
|
||||
"notification.update_is_available": "NixOS update is available!",
|
||||
"notification.update_check_completed": "NixOS update check completed!",
|
||||
"notification.update_command_is_empty": "Update command is empty!",
|
||||
"notification.optimize_command_is_empty": "Optimize command is empty!",
|
||||
"notification.clean_command_is_empty": "Clean command is empty!",
|
||||
"panel.title": "Nix Monitor",
|
||||
"panel.cancel": "Cancel",
|
||||
"panel.update": "Update",
|
||||
"panel.check": "Check",
|
||||
"panel.optimize": "Optimize",
|
||||
"panel.clean": "Clean",
|
||||
"panel.local": "Local",
|
||||
"panel.remote": "Remote",
|
||||
"panel.last_checked": "Last checked",
|
||||
"panel.current": "Current",
|
||||
"panel.store_size": "Store size",
|
||||
"panel.closure_size": "Closure size",
|
||||
"terminal.press_enter_to_exit": "Press enter to exit...",
|
||||
"setting.widget.show_text.label": "Show text",
|
||||
"setting.widget.colorize_text.label": "Colorize text",
|
||||
"setting.widget.show_glyph.label": "Show glyph",
|
||||
"setting.widget.colorize_glyph.label": "Colorize glyph",
|
||||
"setting.widget.up_to_date_glyph.label": "Up to date glyph",
|
||||
"setting.widget.up_to_date_color.label": "Up to date color",
|
||||
"setting.widget.checking_glyph.label": "Checking glyph",
|
||||
"setting.widget.checking_color.label": "Checking color",
|
||||
"setting.widget.update_available_glyph.label": "Update available glyph",
|
||||
"setting.widget.update_available_color.label": "Update available color",
|
||||
"setting.widget.unknown_glyph.label": "Unknown status glyph",
|
||||
"setting.widget.unknown_color.label": "Unknown status color",
|
||||
"setting.widget.panel_card_background_color.label": "Panel card background color",
|
||||
"setting.widget.panel_card_background_opacity.label": "Panel card background opacity",
|
||||
"setting.update_check_interval.label": "Update check interval",
|
||||
"setting.update_check_interval.description": "How often to check for updates (in minutes)",
|
||||
"setting.update_check_duration_threshold.label": "Update check duration threshold",
|
||||
"setting.update_check_duration_threshold.description": "Cancel update check if it took too long (in minutes)",
|
||||
"setting.system_stats_check_interval.label": "System stats check interval",
|
||||
"setting.system_stats_check_interval.description": "How often to check for system stats (in minutes)",
|
||||
"setting.system_stats_check_duration_threshold.label": "System stats check duration threshold",
|
||||
"setting.system_stats_check_duration_threshold.description": "Cancel system stats check if it took too long (in minutes)",
|
||||
"setting.show_update_check_notification.label": "Show update check notification",
|
||||
"setting.show_update_check_notification.description": "Whether to show a notification whenever update check is in progress and completed",
|
||||
"setting.show_update_available_notification.label": "Show update available notification",
|
||||
"setting.show_update_available_notification.description": "Whether to show a notification whenever an update is available",
|
||||
"setting.branch.label": "Branch",
|
||||
"setting.branch.description": "Which nixpkgs branch to use",
|
||||
"setting.update_command.label": "Update command",
|
||||
"setting.update_command.description": "Command to run when clicking Update button",
|
||||
"setting.optimize_command.label": "Optimize command",
|
||||
"setting.optimize_command.description": "Command to run when clicking Optimize button",
|
||||
"setting.clean_command.label": "Clean command",
|
||||
"setting.clean_command.description": "Command to run when clicking Clean button",
|
||||
"setting.hide_update_button.label": "Hide update button",
|
||||
"setting.hide_update_button.description": "Whether to hide the update button on the panel",
|
||||
"setting.hide_optimize_button.label": "Hide optimize button",
|
||||
"setting.hide_optimize_button.description": "Whether to hide the optimize button on the panel",
|
||||
"setting.hide_clean_button.label": "Hide clean button",
|
||||
"setting.hide_clean_button.description": "Whether to hide the clean button on the panel",
|
||||
"setting.close_on_enter.label": "Close on press Enter",
|
||||
"setting.close_on_enter.description": "Add 'Press enter to exit' on the terminal window",
|
||||
"setting.option.branch.master": "Master",
|
||||
"setting.option.branch.nixos_unstable": "NixOS Unstable",
|
||||
"setting.option.branch.nixos_unstable_small": "NixOS Unstable Small",
|
||||
"setting.option.branch.nixos_26_05": "NixOS 26.05",
|
||||
"setting.option.branch.nixos_25_11": "NixOS 25.11",
|
||||
"setting.option.branch.nixos_25_05": "NixOS 25.05",
|
||||
"setting.option.branch.nixos_24_11": "NixOS 24.11",
|
||||
"setting.option.branch.nixos_24_05": "NixOS 24.05",
|
||||
"setting.option.branch.nixos_23_11": "NixOS 23.11",
|
||||
"setting.option.branch.nixos_23_05": "NixOS 23.05",
|
||||
"setting.option.branch.nixos_26_05_small": "NixOS 26.05 Small",
|
||||
"setting.option.branch.nixos_25_11_small": "NixOS 25.11 Small",
|
||||
"setting.option.branch.nixos_25_05_small": "NixOS 25.05 Small",
|
||||
"setting.option.branch.nixos_24_11_small": "NixOS 24.11 Small",
|
||||
"setting.option.branch.nixos_24_05_small": "NixOS 24.05 Small",
|
||||
"setting.option.branch.nixos_23_11_small": "NixOS 23.11 Small",
|
||||
"setting.option.branch.nixos_23_05_small": "NixOS 23.05 Small"
|
||||
"bar": {
|
||||
"checking": "Checking...",
|
||||
"unknown": "Unknown",
|
||||
"up_to_date": "Up to date",
|
||||
"update_available": "Update available!"
|
||||
},
|
||||
"notification": {
|
||||
"checking_update": "Checking NixOS update...",
|
||||
"clean_command_is_empty": "Clean command is empty!",
|
||||
"optimize_command_is_empty": "Optimize command is empty!",
|
||||
"update_check_completed": "NixOS update check completed!",
|
||||
"update_command_is_empty": "Update command is empty!",
|
||||
"update_is_available": "NixOS update is available!"
|
||||
},
|
||||
"panel": {
|
||||
"cancel": "Cancel",
|
||||
"check": "Check",
|
||||
"optimize": "Optimize",
|
||||
"clean": "Clean",
|
||||
"closure_size": "Closure size",
|
||||
"current": "Current",
|
||||
"last_checked": "Last checked",
|
||||
"local": "Local",
|
||||
"remote": "Remote",
|
||||
"store_size": "Store size",
|
||||
"title": "Nix Monitor",
|
||||
"update": "Update"
|
||||
},
|
||||
"setting": {
|
||||
"branch": {
|
||||
"description": "Which nixpkgs branch to use",
|
||||
"label": "Branch"
|
||||
},
|
||||
"update_command": {
|
||||
"description": "Command to run when clicking Update button",
|
||||
"label": "Update command"
|
||||
},
|
||||
"optimize_command": {
|
||||
"label": "Optimize command",
|
||||
"description": "Command to run when clicking Optimize button"
|
||||
},
|
||||
"clean_command": {
|
||||
"description": "Command to run when clicking Clean button",
|
||||
"label": "Clean command"
|
||||
},
|
||||
"close_on_enter": {
|
||||
"description": "Add 'Press enter to exit' on the terminal window",
|
||||
"label": "Close on press Enter"
|
||||
},
|
||||
"hide_update_button": {
|
||||
"description": "Whether to hide the update button on the panel",
|
||||
"label": "Hide update button"
|
||||
},
|
||||
"hide_optimize_button": {
|
||||
"label": "Hide optimize button",
|
||||
"description": "Whether to hide the optimize button on the panel"
|
||||
},
|
||||
"hide_clean_button": {
|
||||
"description": "Whether to hide the clean button on the panel",
|
||||
"label": "Hide clean button"
|
||||
},
|
||||
"option": {
|
||||
"branch": {
|
||||
"master": "Master",
|
||||
"nixos_23_05": "NixOS 23.05",
|
||||
"nixos_23_05_small": "NixOS 23.05 Small",
|
||||
"nixos_23_11": "NixOS 23.11",
|
||||
"nixos_23_11_small": "NixOS 23.11 Small",
|
||||
"nixos_24_05": "NixOS 24.05",
|
||||
"nixos_24_05_small": "NixOS 24.05 Small",
|
||||
"nixos_24_11": "NixOS 24.11",
|
||||
"nixos_24_11_small": "NixOS 24.11 Small",
|
||||
"nixos_25_05": "NixOS 25.05",
|
||||
"nixos_25_05_small": "NixOS 25.05 Small",
|
||||
"nixos_25_11": "NixOS 25.11",
|
||||
"nixos_25_11_small": "NixOS 25.11 Small",
|
||||
"nixos_26_05": "NixOS 26.05",
|
||||
"nixos_26_05_small": "NixOS 26.05 Small",
|
||||
"nixos_unstable": "NixOS Unstable",
|
||||
"nixos_unstable_small": "NixOS Unstable Small"
|
||||
}
|
||||
},
|
||||
"show_update_available_notification": {
|
||||
"description": "Whether to show a notification whenever an update is available",
|
||||
"label": "Show update available notification"
|
||||
},
|
||||
"show_update_check_notification": {
|
||||
"description": "Whether to show a notification whenever update check is in progress and completed",
|
||||
"label": "Show update check notification"
|
||||
},
|
||||
"system_stats_check_duration_threshold": {
|
||||
"description": "Cancel system stats check if it took too long (in minutes)",
|
||||
"label": "System stats check duration threshold"
|
||||
},
|
||||
"system_stats_check_interval": {
|
||||
"description": "How often to check for system stats (in minutes)",
|
||||
"label": "System stats check interval"
|
||||
},
|
||||
"update_check_duration_threshold": {
|
||||
"description": "Cancel update check if it took too long (in minutes)",
|
||||
"label": "Update check duration threshold"
|
||||
},
|
||||
"update_check_interval": {
|
||||
"description": "How often to check for updates (in minutes)",
|
||||
"label": "Update check interval"
|
||||
},
|
||||
"widget": {
|
||||
"checking_color": {
|
||||
"label": "Checking color"
|
||||
},
|
||||
"checking_glyph": {
|
||||
"label": "Checking glyph"
|
||||
},
|
||||
"colorize_glyph": {
|
||||
"label": "Colorize glyph"
|
||||
},
|
||||
"colorize_text": {
|
||||
"label": "Colorize text"
|
||||
},
|
||||
"panel_card_background_color": {
|
||||
"label": "Panel card background color"
|
||||
},
|
||||
"panel_card_background_opacity": {
|
||||
"label": "Panel card background opacity"
|
||||
},
|
||||
"show_glyph": {
|
||||
"label": "Show glyph"
|
||||
},
|
||||
"show_text": {
|
||||
"label": "Show text"
|
||||
},
|
||||
"unknown_color": {
|
||||
"label": "Unknown status color"
|
||||
},
|
||||
"unknown_glyph": {
|
||||
"label": "Unknown status glyph"
|
||||
},
|
||||
"up_to_date_color": {
|
||||
"label": "Up to date color"
|
||||
},
|
||||
"up_to_date_glyph": {
|
||||
"label": "Up to date glyph"
|
||||
},
|
||||
"update_available_color": {
|
||||
"label": "Update available color"
|
||||
},
|
||||
"update_available_glyph": {
|
||||
"label": "Update available glyph"
|
||||
}
|
||||
}
|
||||
},
|
||||
"terminal": {
|
||||
"press_enter_to_exit": "Press enter to exit..."
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user