mirror of
https://github.com/linuxmint/timeshift.git
synced 2024-09-11 17:07:43 +03:00
Merge pull request #7 from luzpaz/typos
Fix various typos in the source
This commit is contained in:
commit
e7341d351f
@ -275,7 +275,7 @@ public class Main : GLib.Object{
|
|||||||
this.app_conf_path = "/etc/timeshift/timeshift.json";
|
this.app_conf_path = "/etc/timeshift/timeshift.json";
|
||||||
this.app_conf_path_old = "/etc/timeshift.json";
|
this.app_conf_path_old = "/etc/timeshift.json";
|
||||||
this.app_conf_path_default = "/etc/timeshift/default.json";
|
this.app_conf_path_default = "/etc/timeshift/default.json";
|
||||||
//sys_root and sys_home will be initalized by update_partition_list()
|
//sys_root and sys_home will be initialized by update_partition_list()
|
||||||
|
|
||||||
// check if running locally ------------------------
|
// check if running locally ------------------------
|
||||||
|
|
||||||
@ -1374,7 +1374,7 @@ public class Main : GLib.Object{
|
|||||||
|
|
||||||
// rsync file system -------------------
|
// rsync file system -------------------
|
||||||
|
|
||||||
progress_text = _("Synching files with rsync...");
|
progress_text = _("Syncing files with rsync...");
|
||||||
log_msg(progress_text);
|
log_msg(progress_text);
|
||||||
|
|
||||||
var log_file = snapshot_path + "/rsync-log";
|
var log_file = snapshot_path + "/rsync-log";
|
||||||
@ -1850,7 +1850,7 @@ public class Main : GLib.Object{
|
|||||||
|
|
||||||
Note:
|
Note:
|
||||||
Mapped name may be different on running system, or it may be same.
|
Mapped name may be different on running system, or it may be same.
|
||||||
Since it is not reliable, we will try to identify the parent intead of the mapped device.
|
Since it is not reliable, we will try to identify the parent instead of the mapped device.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (fs_entry.device_string.has_prefix("/dev/mapper/")){
|
if (fs_entry.device_string.has_prefix("/dev/mapper/")){
|
||||||
@ -2395,7 +2395,7 @@ public class Main : GLib.Object{
|
|||||||
}
|
}
|
||||||
|
|
||||||
// sync file systems
|
// sync file systems
|
||||||
sh += "echo '" + _("Synching file systems...") + "' \n";
|
sh += "echo '" + _("Syncing file systems...") + "' \n";
|
||||||
sh += "sync ; sleep 10s; \n";
|
sh += "sync ; sleep 10s; \n";
|
||||||
sh += "echo '' \n";
|
sh += "echo '' \n";
|
||||||
|
|
||||||
@ -2565,7 +2565,7 @@ public class Main : GLib.Object{
|
|||||||
progress_text = _("Comparing files with rsync...");
|
progress_text = _("Comparing files with rsync...");
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
progress_text = _("Synching files with rsync...");
|
progress_text = _("Syncing files with rsync...");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2806,7 +2806,7 @@ public class Main : GLib.Object{
|
|||||||
log_msg(_("Cloning system..."));
|
log_msg(_("Cloning system..."));
|
||||||
}
|
}
|
||||||
|
|
||||||
progress_text = _("Synching files with rsync...");
|
progress_text = _("Syncing files with rsync...");
|
||||||
log_msg(progress_text);
|
log_msg(progress_text);
|
||||||
|
|
||||||
bool ok = true;
|
bool ok = true;
|
||||||
@ -3796,7 +3796,7 @@ public class Main : GLib.Object{
|
|||||||
|
|
||||||
public void query_subvolume_info(SnapshotRepo parent_repo){
|
public void query_subvolume_info(SnapshotRepo parent_repo){
|
||||||
|
|
||||||
// SnapshotRepo contructor calls this code in load_snapshots()
|
// SnapshotRepo constructor calls this code in load_snapshots()
|
||||||
// save the new object reference to repo since repo still holds previous object
|
// save the new object reference to repo since repo still holds previous object
|
||||||
repo = parent_repo;
|
repo = parent_repo;
|
||||||
|
|
||||||
|
@ -149,7 +149,7 @@ class SettingsWindow : Gtk.Window{
|
|||||||
|
|
||||||
this.resize(def_width, def_height);
|
this.resize(def_width, def_height);
|
||||||
|
|
||||||
//backup_dev_box.refresh(); //will be triggerred indirectly
|
//backup_dev_box.refresh(); //will be triggered indirectly
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -963,7 +963,7 @@ public class Device : GLib.Object{
|
|||||||
filesystemtype - the type of filesystem mounted.
|
filesystemtype - the type of filesystem mounted.
|
||||||
options - the mount options for the filesystem
|
options - the mount options for the filesystem
|
||||||
dump - used by dump to decide if the filesystem needs dumping.
|
dump - used by dump to decide if the filesystem needs dumping.
|
||||||
fsckorder - used by fsck to detrmine the fsck pass to use.
|
fsckorder - used by fsck to determine the fsck pass to use.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Note:
|
/* Note:
|
||||||
|
@ -58,7 +58,7 @@ public class FileItem : GLib.Object,Gee.Comparable<FileItem> {
|
|||||||
|
|
||||||
public GLib.Icon icon;
|
public GLib.Icon icon;
|
||||||
|
|
||||||
// contructors -------------------------------
|
// constructors -------------------------------
|
||||||
|
|
||||||
public FileItem(string name) {
|
public FileItem(string name) {
|
||||||
file_name = name;
|
file_name = name;
|
||||||
|
@ -220,7 +220,7 @@ public class FsTabEntry : GLib.Object{
|
|||||||
|
|
||||||
Note:
|
Note:
|
||||||
Mapped name may be different on running system, or it may be same.
|
Mapped name may be different on running system, or it may be same.
|
||||||
Since it is not reliable, we will try to identify the parent intead of the mapped device.
|
Since it is not reliable, we will try to identify the parent instead of the mapped device.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (device_string.has_prefix("/dev/mapper/")){
|
if (device_string.has_prefix("/dev/mapper/")){
|
||||||
|
@ -145,7 +145,7 @@ namespace TeeJee.GtkHelper{
|
|||||||
|
|
||||||
public bool gtk_combobox_set_value (ComboBox combo, int index, string val){
|
public bool gtk_combobox_set_value (ComboBox combo, int index, string val){
|
||||||
|
|
||||||
/* Conveniance function to set combobox value */
|
/* Convenience function to set combobox value */
|
||||||
|
|
||||||
TreeIter iter;
|
TreeIter iter;
|
||||||
string comboVal;
|
string comboVal;
|
||||||
@ -166,7 +166,7 @@ namespace TeeJee.GtkHelper{
|
|||||||
|
|
||||||
public string gtk_combobox_get_value (ComboBox combo, int index, string default_value){
|
public string gtk_combobox_get_value (ComboBox combo, int index, string default_value){
|
||||||
|
|
||||||
/* Conveniance function to get combobox value */
|
/* Convenience function to get combobox value */
|
||||||
|
|
||||||
if ((combo.model == null) || (combo.active < 0)) { return default_value; }
|
if ((combo.model == null) || (combo.active < 0)) { return default_value; }
|
||||||
|
|
||||||
@ -181,7 +181,7 @@ namespace TeeJee.GtkHelper{
|
|||||||
|
|
||||||
public GLib.Object gtk_combobox_get_selected_object (ComboBox combo, int index, GLib.Object default_value){
|
public GLib.Object gtk_combobox_get_selected_object (ComboBox combo, int index, GLib.Object default_value){
|
||||||
|
|
||||||
/* Conveniance function to get combobox value */
|
/* Convenience function to get combobox value */
|
||||||
|
|
||||||
if ((combo.model == null) || (combo.active < 0)) { return default_value; }
|
if ((combo.model == null) || (combo.active < 0)) { return default_value; }
|
||||||
|
|
||||||
@ -196,7 +196,7 @@ namespace TeeJee.GtkHelper{
|
|||||||
|
|
||||||
public int gtk_combobox_get_value_enum (ComboBox combo, int index, int default_value){
|
public int gtk_combobox_get_value_enum (ComboBox combo, int index, int default_value){
|
||||||
|
|
||||||
/* Conveniance function to get combobox value */
|
/* Convenience function to get combobox value */
|
||||||
|
|
||||||
if ((combo.model == null) || (combo.active < 0)) { return default_value; }
|
if ((combo.model == null) || (combo.active < 0)) { return default_value; }
|
||||||
|
|
||||||
|
@ -101,7 +101,7 @@ public class RsyncTask : AsyncTask{
|
|||||||
s size of a regular file is different and is being updated
|
s size of a regular file is different and is being updated
|
||||||
t modification time is different and is being updated
|
t modification time is different and is being updated
|
||||||
p permissions are different and is being updated
|
p permissions are different and is being updated
|
||||||
o owner is differen and is being updated
|
o owner is different and is being updated
|
||||||
g group is different and is being updated
|
g group is different and is being updated
|
||||||
u reserved for future use.
|
u reserved for future use.
|
||||||
a ACL information changed.
|
a ACL information changed.
|
||||||
|
Loading…
Reference in New Issue
Block a user