diff --git a/ChangeLog b/ChangeLog index 3e6f8ac6..8f28496e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,45 @@ +2024-06-11 Thomas Tsai + + update btrfs to 6.8.1 + +2024-05-25 Yu-Chin Tsai + + update docs + +2024-03-25 Thomas Tsai + + add btrfs more detail logs + +2023-12-11 Thomas Tsai + + find more incompatable types + + Accept the patch to fix incompatible function argument types from David Restall. + +2023-11-29 Thomas Tsai + + fix test + +2023-11-28 Thomas Tsai + + fix more exit 0 + + fix #241. return 0 in case of error + +2023-11-17 Thomas Tsai + + upgrade btrfs to v6.6.2 + +2023-10-22 Yu-Chin Tsai + + update automake for bash completion + + add bash completion script + 2023-10-04 Thomas Tsai + update log, po, docs and set version 0.3.27 update configure.ac + merge partclone.imager.xml to partclone.xml update doc for partclone.8 diff --git a/po/de.gmo b/po/de.gmo index 282c0c0d..fd44ad9b 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 749825e7..6988dbc5 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Partclone 0.3.3\n" -"Report-Msgid-Bugs-To: thomas@nchc.org.tw\n" -"POT-Creation-Date: 2023-10-04 17:06+0800\n" +"Report-Msgid-Bugs-To: thomas@clonezilla.org\n" +"POT-Creation-Date: 2024-06-11 14:36+0800\n" "PO-Revision-Date: 2023-05-15 18:40+0300\n" "Last-Translator: Stanislav Bolshakov \n" "Language-Team: Deutsch\n" @@ -116,178 +116,178 @@ msgstr "Gesamtzeit: %s Verbleibend: %s " msgid "Ave. Rate: %6.2f%s/min" msgstr "Durchschnittsrate: %6.2f%s/min" -#: src/partclone.c:1905 +#: src/partclone.c:1906 #, c-format msgid "Partclone v%s http://partclone.org\n" msgstr "Partclone v%s http://partclone.org\n" -#: src/partclone.c:1907 +#: src/partclone.c:1908 #, c-format msgid "Starting to check image (%s)\n" msgstr "Ich fange an, das Bild zu überprüfen (%s)\n" -#: src/partclone.c:1910 +#: src/partclone.c:1911 #, c-format msgid "Starting to clone device (%s) to compressed image (%s)\n" msgstr "Das Klonen des Geräts (%s) in ein komprimiertes Bild beginnt (%s)\n" -#: src/partclone.c:1912 +#: src/partclone.c:1913 #, c-format msgid "Starting to clone device (%s) to image (%s)\n" msgstr "Das Klonen des Geräts (%s) in das Image beginnt (%s)\n" -#: src/partclone.c:1915 +#: src/partclone.c:1916 #, c-format msgid "Starting to restore image (%s) to block files (%s)\n" msgstr "" "Die Wiederherstellung des Images (%s) zum Blockieren von Dateien wird " "gestartet (%s)\n" -#: src/partclone.c:1917 +#: src/partclone.c:1918 #, c-format msgid "Starting to restore image (%s) to device (%s)\n" msgstr "Die Wiederherstellung des Images (%s) auf dem Gerät beginnt (%s)\n" -#: src/partclone.c:1919 +#: src/partclone.c:1920 #, c-format msgid "Starting to back up device (%s) to device (%s)\n" msgstr "Die Sicherung von Gerät (%s) auf Gerät beginnt (%s)\n" -#: src/partclone.c:1921 +#: src/partclone.c:1922 #, c-format msgid "Starting to map device (%s) to domain log (%s)\n" msgstr "Die Zuordnung des Geräts (%s) zum Domänenprotokoll beginnt (%s)\n" -#: src/partclone.c:1924 +#: src/partclone.c:1925 #, c-format msgid "Starting to dd image (%s) to block files (%s)\n" msgstr "Das dd-Kopieren des Bildes (%s) in Blockdateien beginnt (%s)\n" -#: src/partclone.c:1926 +#: src/partclone.c:1927 #, c-format msgid "Starting to clone/restore (%s) to (%s) with dd mode\n" msgstr "Beginn des Klonens/Wiederherstellens von (%s) nach (%s) im dd-Modus\n" -#: src/partclone.c:1928 +#: src/partclone.c:1929 #, c-format msgid "Showing info of image (%s)\n" msgstr "Informationen zum Bild werden angezeigt (%s)\n" -#: src/partclone.c:1930 +#: src/partclone.c:1931 msgid "Unknown mode\n" msgstr "" -#: src/partclone.c:1950 +#: src/partclone.c:1951 #, c-format msgid "File system: %s\n" msgstr "Dateisystem: %s\n" -#: src/partclone.c:1953 +#: src/partclone.c:1954 #, c-format msgid "Device size: %s = %llu Blocks\n" msgstr "Gerätegröße: %s = %llu Blöcke\n" -#: src/partclone.c:1956 +#: src/partclone.c:1957 #, c-format msgid "Space in use: %s = %llu Blocks\n" msgstr "Genutzter Raum: %s = %llu Blöcke\n" -#: src/partclone.c:1959 +#: src/partclone.c:1960 #, c-format msgid "Free Space: %s = %llu Blocks\n" msgstr "Freiraum: %s = %llu Blöcke\n" -#: src/partclone.c:1961 +#: src/partclone.c:1962 #, c-format msgid "Block size: %i Byte\n" msgstr "Block Größe: %i Byte\n" -#: src/partclone.c:1962 +#: src/partclone.c:1963 #, fuzzy, c-format msgid "Used Blocks in Super-Block: %llu Blocks\n" msgstr "Genutzter Raum: %s = %llu Blöcke\n" -#: src/partclone.c:1975 +#: src/partclone.c:1976 #, c-format msgid "image format: %04d\n" msgstr "bildformat: %04d\n" -#: src/partclone.c:1979 src/partclone.c:1986 +#: src/partclone.c:1980 src/partclone.c:1987 #, c-format msgid "created on a: %s\n" msgstr "erstellt auf a: %s\n" -#: src/partclone.c:1981 src/partclone.c:1989 +#: src/partclone.c:1982 src/partclone.c:1990 #, c-format msgid "with partclone: %s\n" msgstr "mit partclone: %s\n" -#: src/partclone.c:1985 +#: src/partclone.c:1986 #, c-format msgid "%d bits platform" msgstr "%d Bits-Plattform" -#: src/partclone.c:1988 +#: src/partclone.c:1989 #, c-format msgid "v%s" msgstr "v%s" -#: src/partclone.c:1992 +#: src/partclone.c:1993 #, c-format msgid "bitmap mode: %s\n" msgstr "bitmap-Modus: %s\n" -#: src/partclone.c:1994 +#: src/partclone.c:1995 #, c-format msgid "checksum algo: %s\n" msgstr "prüfsummenalgo: %s\n" -#: src/partclone.c:1998 src/partclone.c:2007 +#: src/partclone.c:1999 src/partclone.c:2008 #, c-format msgid "checksum size: %s\n" msgstr "prüfsummengröße: %s\n" -#: src/partclone.c:2000 src/partclone.c:2010 +#: src/partclone.c:2001 src/partclone.c:2011 #, c-format msgid "blocks/checksum: %s\n" msgstr "blöcke/prüfsumme: %s\n" -#: src/partclone.c:2002 src/partclone.c:2012 +#: src/partclone.c:2003 src/partclone.c:2013 #, c-format msgid "reseed checksum: %s\n" msgstr "prüfsumme neu setzen: %s\n" -#: src/partclone.c:2012 +#: src/partclone.c:2013 msgid "yes" msgstr "ja" -#: src/partclone.c:2012 +#: src/partclone.c:2013 msgid "no" msgstr "nein" -#: src/partclone.c:2025 +#: src/partclone.c:2026 #, c-format msgid "Partclone successfully checked the image (%s)\n" msgstr "Partclone hat das Bild erfolgreich überprüft (%s)\n" -#: src/partclone.c:2027 +#: src/partclone.c:2028 #, c-format msgid "Partclone successfully cloned the device (%s) to the image (%s)\n" msgstr "Partclone hat das Gerät (%s) erfolgreich in das Image geklont (%s)\n" -#: src/partclone.c:2029 +#: src/partclone.c:2030 #, c-format msgid "Partclone successfully restored the image (%s) to the device (%s)\n" msgstr "" "Partclone hat das Image (%s) erfolgreich auf dem Gerät wiederhergestellt " "(%s)\n" -#: src/partclone.c:2031 +#: src/partclone.c:2032 #, c-format msgid "Partclone successfully cloned the device (%s) to the device (%s)\n" msgstr "Partclone hat das Gerät (%s) erfolgreich auf das Gerät geklont (%s)\n" -#: src/partclone.c:2033 +#: src/partclone.c:2034 #, c-format msgid "Partclone successfully mapped the device (%s) to the domain log (%s)\n" msgstr "" diff --git a/po/fr_FR.gmo b/po/fr_FR.gmo index 6ef7d833..c02f193d 100644 Binary files a/po/fr_FR.gmo and b/po/fr_FR.gmo differ diff --git a/po/fr_FR.po b/po/fr_FR.po index 6827c285..0f3572b5 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Partclone 0.2.9\n" -"Report-Msgid-Bugs-To: thomas@nchc.org.tw\n" -"POT-Creation-Date: 2023-10-04 17:06+0800\n" +"Report-Msgid-Bugs-To: thomas@clonezilla.org\n" +"POT-Creation-Date: 2024-06-11 14:36+0800\n" "PO-Revision-Date: 2010-11-01 10:13+0100\n" "Last-Translator: \n" "Language-Team: French \n" @@ -113,177 +113,177 @@ msgstr "Durée totale : %s Restant: %s " msgid "Ave. Rate: %6.2f%s/min" msgstr "Débit moyen : %6.2f%s/min" -#: src/partclone.c:1905 +#: src/partclone.c:1906 #, c-format msgid "Partclone v%s http://partclone.org\n" msgstr "Partclone v%s http://partclone.org\n" -#: src/partclone.c:1907 +#: src/partclone.c:1908 #, c-format msgid "Starting to check image (%s)\n" msgstr "Démarrage audit image (%s)\n" -#: src/partclone.c:1910 +#: src/partclone.c:1911 #, c-format msgid "Starting to clone device (%s) to compressed image (%s)\n" msgstr "Début du clonage du périphérique (%s) vers l'image compressée (%s)\n" -#: src/partclone.c:1912 +#: src/partclone.c:1913 #, c-format msgid "Starting to clone device (%s) to image (%s)\n" msgstr "Démarrage clonage périphérique (%s) vers image (%s)\n" -#: src/partclone.c:1915 +#: src/partclone.c:1916 #, c-format msgid "Starting to restore image (%s) to block files (%s)\n" msgstr "" "Début de la restauration de l'image (%s) pour bloquer les fichiers (%s)\n" -#: src/partclone.c:1917 +#: src/partclone.c:1918 #, c-format msgid "Starting to restore image (%s) to device (%s)\n" msgstr "Démarrage restauration image (%s) vers périphérique (%s)\n" -#: src/partclone.c:1919 +#: src/partclone.c:1920 #, c-format msgid "Starting to back up device (%s) to device (%s)\n" msgstr "Démarrage sauvegarde périphérique (%s) vers périphérique (%s)\n" -#: src/partclone.c:1921 +#: src/partclone.c:1922 #, c-format msgid "Starting to map device (%s) to domain log (%s)\n" msgstr "Début du mappage du périphérique (%s) au journal de domaine (%s)\n" -#: src/partclone.c:1924 +#: src/partclone.c:1925 #, c-format msgid "Starting to dd image (%s) to block files (%s)\n" msgstr "Démarrage de l'image dd (%s) pour bloquer les fichiers (%s)\n" -#: src/partclone.c:1926 +#: src/partclone.c:1927 #, c-format msgid "Starting to clone/restore (%s) to (%s) with dd mode\n" msgstr "Démarrage du clonage/restauration (%s) vers (%s) avec le mode dd\n" -#: src/partclone.c:1928 +#: src/partclone.c:1929 #, c-format msgid "Showing info of image (%s)\n" msgstr "Affichage des informations de l'image (%s)\n" -#: src/partclone.c:1930 +#: src/partclone.c:1931 msgid "Unknown mode\n" msgstr "" -#: src/partclone.c:1950 +#: src/partclone.c:1951 #, c-format msgid "File system: %s\n" msgstr "Système de fichiers : %s\n" -#: src/partclone.c:1953 +#: src/partclone.c:1954 #, c-format msgid "Device size: %s = %llu Blocks\n" msgstr "Taille de l'appareil : %s = %llu Blocs\n" -#: src/partclone.c:1956 +#: src/partclone.c:1957 #, c-format msgid "Space in use: %s = %llu Blocks\n" msgstr "Espace utilisé : %s = %llu Blocs\n" -#: src/partclone.c:1959 +#: src/partclone.c:1960 #, c-format msgid "Free Space: %s = %llu Blocks\n" msgstr "Espace libre : %s = %llu blocs\n" -#: src/partclone.c:1961 +#: src/partclone.c:1962 #, c-format msgid "Block size: %i Byte\n" msgstr "Taille de bloc : %i octets\n" -#: src/partclone.c:1962 +#: src/partclone.c:1963 #, fuzzy, c-format msgid "Used Blocks in Super-Block: %llu Blocks\n" msgstr "Espace utilisé : %s = %llu Blocs\n" -#: src/partclone.c:1975 +#: src/partclone.c:1976 #, c-format msgid "image format: %04d\n" msgstr "format d'image : %04d\n" -#: src/partclone.c:1979 src/partclone.c:1986 +#: src/partclone.c:1980 src/partclone.c:1987 #, c-format msgid "created on a: %s\n" msgstr "créé sur un : %s\n" -#: src/partclone.c:1981 src/partclone.c:1989 +#: src/partclone.c:1982 src/partclone.c:1990 #, c-format msgid "with partclone: %s\n" msgstr "avec clone partiel : %s\n" -#: src/partclone.c:1985 +#: src/partclone.c:1986 #, c-format msgid "%d bits platform" msgstr "plate-forme %d bits" -#: src/partclone.c:1988 +#: src/partclone.c:1989 #, c-format msgid "v%s" msgstr "v%s" -#: src/partclone.c:1992 +#: src/partclone.c:1993 #, c-format msgid "bitmap mode: %s\n" msgstr "mode bitmap : %s\n" -#: src/partclone.c:1994 +#: src/partclone.c:1995 #, c-format msgid "checksum algo: %s\n" msgstr "algorithme de somme de contrôle : %s\n" -#: src/partclone.c:1998 src/partclone.c:2007 +#: src/partclone.c:1999 src/partclone.c:2008 #, c-format msgid "checksum size: %s\n" msgstr "taille de la somme de contrôle : %s\n" -#: src/partclone.c:2000 src/partclone.c:2010 +#: src/partclone.c:2001 src/partclone.c:2011 #, c-format msgid "blocks/checksum: %s\n" msgstr "blocs/somme de contrôle : %s\n" -#: src/partclone.c:2002 src/partclone.c:2012 +#: src/partclone.c:2003 src/partclone.c:2013 #, c-format msgid "reseed checksum: %s\n" msgstr "réamorcer la somme de contrôle : %s\n" -#: src/partclone.c:2012 +#: src/partclone.c:2013 msgid "yes" msgstr "oui" -#: src/partclone.c:2012 +#: src/partclone.c:2013 msgid "no" msgstr "non" -#: src/partclone.c:2025 +#: src/partclone.c:2026 #, c-format msgid "Partclone successfully checked the image (%s)\n" msgstr "Partclone a vérifié l'image avec succès (%s)\n" -#: src/partclone.c:2027 +#: src/partclone.c:2028 #, c-format msgid "Partclone successfully cloned the device (%s) to the image (%s)\n" msgstr "Partclone a réussi à cloner le périphérique (%s) vers l'image (%s)\n" -#: src/partclone.c:2029 +#: src/partclone.c:2030 #, c-format msgid "Partclone successfully restored the image (%s) to the device (%s)\n" msgstr "" "Partclone a réussi à restaurer l'image (%s) vers le périphérique (%s)\n" -#: src/partclone.c:2031 +#: src/partclone.c:2032 #, c-format msgid "Partclone successfully cloned the device (%s) to the device (%s)\n" msgstr "" "Partclone a réussi à cloner le périphérique (%s) vers le périphérique (%s)\n" -#: src/partclone.c:2033 +#: src/partclone.c:2034 #, c-format msgid "Partclone successfully mapped the device (%s) to the domain log (%s)\n" msgstr "" diff --git a/po/partclone.pot b/po/partclone.pot index ab7c5e7a..51ab1206 100644 --- a/po/partclone.pot +++ b/po/partclone.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: thomas@nchc.org.tw\n" -"POT-Creation-Date: 2023-10-04 17:06+0800\n" +"Report-Msgid-Bugs-To: thomas@clonezilla.org\n" +"POT-Creation-Date: 2024-06-11 14:36+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -110,174 +110,174 @@ msgstr "" msgid "Ave. Rate: %6.2f%s/min" msgstr "" -#: src/partclone.c:1905 +#: src/partclone.c:1906 #, c-format msgid "Partclone v%s http://partclone.org\n" msgstr "" -#: src/partclone.c:1907 +#: src/partclone.c:1908 #, c-format msgid "Starting to check image (%s)\n" msgstr "" -#: src/partclone.c:1910 +#: src/partclone.c:1911 #, c-format msgid "Starting to clone device (%s) to compressed image (%s)\n" msgstr "" -#: src/partclone.c:1912 +#: src/partclone.c:1913 #, c-format msgid "Starting to clone device (%s) to image (%s)\n" msgstr "" -#: src/partclone.c:1915 +#: src/partclone.c:1916 #, c-format msgid "Starting to restore image (%s) to block files (%s)\n" msgstr "" -#: src/partclone.c:1917 +#: src/partclone.c:1918 #, c-format msgid "Starting to restore image (%s) to device (%s)\n" msgstr "" -#: src/partclone.c:1919 +#: src/partclone.c:1920 #, c-format msgid "Starting to back up device (%s) to device (%s)\n" msgstr "" -#: src/partclone.c:1921 +#: src/partclone.c:1922 #, c-format msgid "Starting to map device (%s) to domain log (%s)\n" msgstr "" -#: src/partclone.c:1924 +#: src/partclone.c:1925 #, c-format msgid "Starting to dd image (%s) to block files (%s)\n" msgstr "" -#: src/partclone.c:1926 +#: src/partclone.c:1927 #, c-format msgid "Starting to clone/restore (%s) to (%s) with dd mode\n" msgstr "" -#: src/partclone.c:1928 +#: src/partclone.c:1929 #, c-format msgid "Showing info of image (%s)\n" msgstr "" -#: src/partclone.c:1930 +#: src/partclone.c:1931 msgid "Unknown mode\n" msgstr "" -#: src/partclone.c:1950 +#: src/partclone.c:1951 #, c-format msgid "File system: %s\n" msgstr "" -#: src/partclone.c:1953 +#: src/partclone.c:1954 #, c-format msgid "Device size: %s = %llu Blocks\n" msgstr "" -#: src/partclone.c:1956 +#: src/partclone.c:1957 #, c-format msgid "Space in use: %s = %llu Blocks\n" msgstr "" -#: src/partclone.c:1959 +#: src/partclone.c:1960 #, c-format msgid "Free Space: %s = %llu Blocks\n" msgstr "" -#: src/partclone.c:1961 +#: src/partclone.c:1962 #, c-format msgid "Block size: %i Byte\n" msgstr "" -#: src/partclone.c:1962 +#: src/partclone.c:1963 #, c-format msgid "Used Blocks in Super-Block: %llu Blocks\n" msgstr "" -#: src/partclone.c:1975 +#: src/partclone.c:1976 #, c-format msgid "image format: %04d\n" msgstr "" -#: src/partclone.c:1979 src/partclone.c:1986 +#: src/partclone.c:1980 src/partclone.c:1987 #, c-format msgid "created on a: %s\n" msgstr "" -#: src/partclone.c:1981 src/partclone.c:1989 +#: src/partclone.c:1982 src/partclone.c:1990 #, c-format msgid "with partclone: %s\n" msgstr "" -#: src/partclone.c:1985 +#: src/partclone.c:1986 #, c-format msgid "%d bits platform" msgstr "" -#: src/partclone.c:1988 +#: src/partclone.c:1989 #, c-format msgid "v%s" msgstr "" -#: src/partclone.c:1992 +#: src/partclone.c:1993 #, c-format msgid "bitmap mode: %s\n" msgstr "" -#: src/partclone.c:1994 +#: src/partclone.c:1995 #, c-format msgid "checksum algo: %s\n" msgstr "" -#: src/partclone.c:1998 src/partclone.c:2007 +#: src/partclone.c:1999 src/partclone.c:2008 #, c-format msgid "checksum size: %s\n" msgstr "" -#: src/partclone.c:2000 src/partclone.c:2010 +#: src/partclone.c:2001 src/partclone.c:2011 #, c-format msgid "blocks/checksum: %s\n" msgstr "" -#: src/partclone.c:2002 src/partclone.c:2012 +#: src/partclone.c:2003 src/partclone.c:2013 #, c-format msgid "reseed checksum: %s\n" msgstr "" -#: src/partclone.c:2012 +#: src/partclone.c:2013 msgid "yes" msgstr "" -#: src/partclone.c:2012 +#: src/partclone.c:2013 msgid "no" msgstr "" -#: src/partclone.c:2025 +#: src/partclone.c:2026 #, c-format msgid "Partclone successfully checked the image (%s)\n" msgstr "" -#: src/partclone.c:2027 +#: src/partclone.c:2028 #, c-format msgid "Partclone successfully cloned the device (%s) to the image (%s)\n" msgstr "" -#: src/partclone.c:2029 +#: src/partclone.c:2030 #, c-format msgid "Partclone successfully restored the image (%s) to the device (%s)\n" msgstr "" -#: src/partclone.c:2031 +#: src/partclone.c:2032 #, c-format msgid "Partclone successfully cloned the device (%s) to the device (%s)\n" msgstr "" -#: src/partclone.c:2033 +#: src/partclone.c:2034 #, c-format msgid "Partclone successfully mapped the device (%s) to the domain log (%s)\n" msgstr "" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index 5d936667..a46cd548 100644 Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ diff --git a/po/pt_BR.po b/po/pt_BR.po index 618bae91..9bac4803 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Partclone 0.3.3\n" -"Report-Msgid-Bugs-To: thomas@nchc.org.tw\n" -"POT-Creation-Date: 2023-10-04 17:06+0800\n" +"Report-Msgid-Bugs-To: thomas@clonezilla.org\n" +"POT-Creation-Date: 2024-06-11 14:36+0800\n" "PO-Revision-Date: 2016-11-04 17:11-0200\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese\n" @@ -114,178 +114,178 @@ msgstr "Tempo total: %s Restante: %s " msgid "Ave. Rate: %6.2f%s/min" msgstr "Taxa média: %6.2f%s/min" -#: src/partclone.c:1905 +#: src/partclone.c:1906 #, c-format msgid "Partclone v%s http://partclone.org\n" msgstr "Partclone v%s http://partclone.org\n" -#: src/partclone.c:1907 +#: src/partclone.c:1908 #, c-format msgid "Starting to check image (%s)\n" msgstr "Iniciando a verificação da imagem (%s)\n" -#: src/partclone.c:1910 +#: src/partclone.c:1911 #, fuzzy, c-format msgid "Starting to clone device (%s) to compressed image (%s)\n" msgstr "Iniciando a clonagem de dispositivo (%s) para imagem (%s)\n" -#: src/partclone.c:1912 +#: src/partclone.c:1913 #, c-format msgid "Starting to clone device (%s) to image (%s)\n" msgstr "Iniciando a clonagem de dispositivo (%s) para imagem (%s)\n" -#: src/partclone.c:1915 +#: src/partclone.c:1916 #, c-format msgid "Starting to restore image (%s) to block files (%s)\n" msgstr "" "Iniciando a restauração da imagem (%s) para bloquear os arquivos (%s)\n" -#: src/partclone.c:1917 +#: src/partclone.c:1918 #, c-format msgid "Starting to restore image (%s) to device (%s)\n" msgstr "Iniciando a restauração da imagem (%s) para dispositivo (%s)\n" -#: src/partclone.c:1919 +#: src/partclone.c:1920 #, c-format msgid "Starting to back up device (%s) to device (%s)\n" msgstr "Iniciando a backup de dispositivo (%s) para dispositivo (%s)\n" -#: src/partclone.c:1921 +#: src/partclone.c:1922 #, c-format msgid "Starting to map device (%s) to domain log (%s)\n" msgstr "" "Iniciando a mapeamento de dispositivo (%s) para registro de domínio (%s)\n" -#: src/partclone.c:1924 +#: src/partclone.c:1925 #, c-format msgid "Starting to dd image (%s) to block files (%s)\n" msgstr "Iniciando adicionar imagem (%s) para bloquear arquivos (%s)\n" -#: src/partclone.c:1926 +#: src/partclone.c:1927 #, c-format msgid "Starting to clone/restore (%s) to (%s) with dd mode\n" msgstr "Iniciando a clonagem/restauração (%s) para (%s) com modo dd\n" -#: src/partclone.c:1928 +#: src/partclone.c:1929 #, c-format msgid "Showing info of image (%s)\n" msgstr "Mostrando info sobre a imagem (%s)\n" -#: src/partclone.c:1930 +#: src/partclone.c:1931 msgid "Unknown mode\n" msgstr "" -#: src/partclone.c:1950 +#: src/partclone.c:1951 #, c-format msgid "File system: %s\n" msgstr "Sistema de arquivos: %s\n" -#: src/partclone.c:1953 +#: src/partclone.c:1954 #, c-format msgid "Device size: %s = %llu Blocks\n" msgstr "Tam. dispos.: %s = %llu blocos\n" -#: src/partclone.c:1956 +#: src/partclone.c:1957 #, c-format msgid "Space in use: %s = %llu Blocks\n" msgstr "Espaço em uso: %s = %llu blocos\n" -#: src/partclone.c:1959 +#: src/partclone.c:1960 #, c-format msgid "Free Space: %s = %llu Blocks\n" msgstr "Espaço livre: %s = %llu blocos\n" -#: src/partclone.c:1961 +#: src/partclone.c:1962 #, c-format msgid "Block size: %i Byte\n" msgstr "Tam. bloco: %i Byte\n" -#: src/partclone.c:1962 +#: src/partclone.c:1963 #, fuzzy, c-format msgid "Used Blocks in Super-Block: %llu Blocks\n" msgstr "Espaço em uso: %s = %llu blocos\n" -#: src/partclone.c:1975 +#: src/partclone.c:1976 #, c-format msgid "image format: %04d\n" msgstr "formato img.: %04d\n" -#: src/partclone.c:1979 src/partclone.c:1986 +#: src/partclone.c:1980 src/partclone.c:1987 #, c-format msgid "created on a: %s\n" msgstr "criada em um: %s\n" -#: src/partclone.c:1981 src/partclone.c:1989 +#: src/partclone.c:1982 src/partclone.c:1990 #, c-format msgid "with partclone: %s\n" msgstr "com partclone: %s\n" -#: src/partclone.c:1985 +#: src/partclone.c:1986 #, c-format msgid "%d bits platform" msgstr "plataforma de %d bits" -#: src/partclone.c:1988 +#: src/partclone.c:1989 #, c-format msgid "v%s" msgstr "v%s" -#: src/partclone.c:1992 +#: src/partclone.c:1993 #, c-format msgid "bitmap mode: %s\n" msgstr "modo bitmap: %s\n" -#: src/partclone.c:1994 +#: src/partclone.c:1995 #, c-format msgid "checksum algo: %s\n" msgstr "algo. checksum: %s\n" -#: src/partclone.c:1998 src/partclone.c:2007 +#: src/partclone.c:1999 src/partclone.c:2008 #, c-format msgid "checksum size: %s\n" msgstr "tam. checksum: %s\n" -#: src/partclone.c:2000 src/partclone.c:2010 +#: src/partclone.c:2001 src/partclone.c:2011 #, c-format msgid "blocks/checksum: %s\n" msgstr "blocos/checksum: %s\n" -#: src/partclone.c:2002 src/partclone.c:2012 +#: src/partclone.c:2003 src/partclone.c:2013 #, c-format msgid "reseed checksum: %s\n" msgstr "ressemear checksum: %s\n" -#: src/partclone.c:2012 +#: src/partclone.c:2013 msgid "yes" msgstr "sim" -#: src/partclone.c:2012 +#: src/partclone.c:2013 msgid "no" msgstr "não" -#: src/partclone.c:2025 +#: src/partclone.c:2026 #, c-format msgid "Partclone successfully checked the image (%s)\n" msgstr "Partclone verificou com sucesso a imagem (%s)\n" -#: src/partclone.c:2027 +#: src/partclone.c:2028 #, c-format msgid "Partclone successfully cloned the device (%s) to the image (%s)\n" msgstr "Partclone clonou com sucesso o dispositivo (%s) para a imagem (%s)\n" -#: src/partclone.c:2029 +#: src/partclone.c:2030 #, c-format msgid "Partclone successfully restored the image (%s) to the device (%s)\n" msgstr "" "Partclone restaurou com sucesso a imagem (%s) para o dispositivo (%s)\n" -#: src/partclone.c:2031 +#: src/partclone.c:2032 #, c-format msgid "Partclone successfully cloned the device (%s) to the device (%s)\n" msgstr "" "Partclone clonou com sucesso o dispositivo (%s) para o dispositivo (%s)\n" -#: src/partclone.c:2033 +#: src/partclone.c:2034 #, c-format msgid "Partclone successfully mapped the device (%s) to the domain log (%s)\n" msgstr "" diff --git a/po/ru.gmo b/po/ru.gmo index b270e05b..1eba1026 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index 508b4bb2..4d504729 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Partclone 0.3.3\n" -"Report-Msgid-Bugs-To: thomas@nchc.org.tw\n" -"POT-Creation-Date: 2023-10-04 17:06+0800\n" +"Report-Msgid-Bugs-To: thomas@clonezilla.org\n" +"POT-Creation-Date: 2024-06-11 14:36+0800\n" "PO-Revision-Date: 2023-05-15 18:47+0300\n" "Last-Translator: Stanislav Bolshakov \n" "Language-Team: Russian\n" @@ -116,174 +116,174 @@ msgstr "Всего времени: %s Осталось: %s " msgid "Ave. Rate: %6.2f%s/min" msgstr "Ср.скорость: %6.2f%s/min" -#: src/partclone.c:1905 +#: src/partclone.c:1906 #, c-format msgid "Partclone v%s http://partclone.org\n" msgstr "Partclone в%s http://partclone.org\n" -#: src/partclone.c:1907 +#: src/partclone.c:1908 #, c-format msgid "Starting to check image (%s)\n" msgstr "Началась проверка файла образа (%s)\n" -#: src/partclone.c:1910 +#: src/partclone.c:1911 #, c-format msgid "Starting to clone device (%s) to compressed image (%s)\n" msgstr "Началось клонирование устройства (%s) в сжатый файл образа (%s)\n" -#: src/partclone.c:1912 +#: src/partclone.c:1913 #, c-format msgid "Starting to clone device (%s) to image (%s)\n" msgstr "Началось клонирование устройства (%s) в файл образа (%s)\n" -#: src/partclone.c:1915 +#: src/partclone.c:1916 #, c-format msgid "Starting to restore image (%s) to block files (%s)\n" msgstr "Началось восстановление образа (%s) в блочные файлы (%s)\n" -#: src/partclone.c:1917 +#: src/partclone.c:1918 #, c-format msgid "Starting to restore image (%s) to device (%s)\n" msgstr "Началось восстановление образа (%s) на устройство (%s)\n" -#: src/partclone.c:1919 +#: src/partclone.c:1920 #, c-format msgid "Starting to back up device (%s) to device (%s)\n" msgstr "Началось копирование устройства (%s) на устройство (%s)\n" -#: src/partclone.c:1921 +#: src/partclone.c:1922 #, c-format msgid "Starting to map device (%s) to domain log (%s)\n" msgstr "Началось map устройства (%s) в log домена (%s)\n" -#: src/partclone.c:1924 +#: src/partclone.c:1925 #, c-format msgid "Starting to dd image (%s) to block files (%s)\n" msgstr "Началось dd-копирование образа (%s) в блочные файлы (%s)\n" -#: src/partclone.c:1926 +#: src/partclone.c:1927 #, c-format msgid "Starting to clone/restore (%s) to (%s) with dd mode\n" msgstr "Началось клонирование/восстановление (%s) на (%s) в режиме dd\n" -#: src/partclone.c:1928 +#: src/partclone.c:1929 #, c-format msgid "Showing info of image (%s)\n" msgstr "Показ информации о образе (%s)\n" -#: src/partclone.c:1930 +#: src/partclone.c:1931 msgid "Unknown mode\n" msgstr "" -#: src/partclone.c:1950 +#: src/partclone.c:1951 #, c-format msgid "File system: %s\n" msgstr "Файловая система: %s\n" -#: src/partclone.c:1953 +#: src/partclone.c:1954 #, c-format msgid "Device size: %s = %llu Blocks\n" msgstr "Размер устр-ва: %s = %llu блоков\n" -#: src/partclone.c:1956 +#: src/partclone.c:1957 #, c-format msgid "Space in use: %s = %llu Blocks\n" msgstr "Использовано: %s = %llu блоков\n" -#: src/partclone.c:1959 +#: src/partclone.c:1960 #, c-format msgid "Free Space: %s = %llu Blocks\n" msgstr "Свободно: %s = %llu блоков\n" -#: src/partclone.c:1961 +#: src/partclone.c:1962 #, c-format msgid "Block size: %i Byte\n" msgstr "Размер блока: %i Байт\n" -#: src/partclone.c:1962 +#: src/partclone.c:1963 #, fuzzy, c-format msgid "Used Blocks in Super-Block: %llu Blocks\n" msgstr "Использовано: %s = %llu блоков\n" -#: src/partclone.c:1975 +#: src/partclone.c:1976 #, c-format msgid "image format: %04d\n" msgstr "формат образа: %04d\n" -#: src/partclone.c:1979 src/partclone.c:1986 +#: src/partclone.c:1980 src/partclone.c:1987 #, c-format msgid "created on a: %s\n" msgstr "создан на: %s\n" -#: src/partclone.c:1981 src/partclone.c:1989 +#: src/partclone.c:1982 src/partclone.c:1990 #, c-format msgid "with partclone: %s\n" msgstr "с partclone: %s\n" -#: src/partclone.c:1985 +#: src/partclone.c:1986 #, c-format msgid "%d bits platform" msgstr "%d-битная платформа" -#: src/partclone.c:1988 +#: src/partclone.c:1989 #, c-format msgid "v%s" msgstr "в%s" -#: src/partclone.c:1992 +#: src/partclone.c:1993 #, c-format msgid "bitmap mode: %s\n" msgstr "режим bitmap: %s\n" -#: src/partclone.c:1994 +#: src/partclone.c:1995 #, c-format msgid "checksum algo: %s\n" msgstr "алгоритм checksum: %s\n" -#: src/partclone.c:1998 src/partclone.c:2007 +#: src/partclone.c:1999 src/partclone.c:2008 #, c-format msgid "checksum size: %s\n" msgstr "размер checksum: %s\n" -#: src/partclone.c:2000 src/partclone.c:2010 +#: src/partclone.c:2001 src/partclone.c:2011 #, c-format msgid "blocks/checksum: %s\n" msgstr "блоков/checksum: %s\n" -#: src/partclone.c:2002 src/partclone.c:2012 +#: src/partclone.c:2003 src/partclone.c:2013 #, c-format msgid "reseed checksum: %s\n" msgstr "повторная checksum: %s\n" -#: src/partclone.c:2012 +#: src/partclone.c:2013 msgid "yes" msgstr "да" -#: src/partclone.c:2012 +#: src/partclone.c:2013 msgid "no" msgstr "нет" -#: src/partclone.c:2025 +#: src/partclone.c:2026 #, c-format msgid "Partclone successfully checked the image (%s)\n" msgstr "Partclone успешно проверил образ (%s)\n" -#: src/partclone.c:2027 +#: src/partclone.c:2028 #, c-format msgid "Partclone successfully cloned the device (%s) to the image (%s)\n" msgstr "Partclone успешно клонировал устройство (%s) в файл образа (%s)\n" -#: src/partclone.c:2029 +#: src/partclone.c:2030 #, c-format msgid "Partclone successfully restored the image (%s) to the device (%s)\n" msgstr "Partclone успешно восстановил образ (%s) на устройство (%s)\n" -#: src/partclone.c:2031 +#: src/partclone.c:2032 #, c-format msgid "Partclone successfully cloned the device (%s) to the device (%s)\n" msgstr "Partclone успешно клонировал устройство (%s) на устройство (%s)\n" -#: src/partclone.c:2033 +#: src/partclone.c:2034 #, c-format msgid "Partclone successfully mapped the device (%s) to the domain log (%s)\n" msgstr "Partclone успешно mapped устройство (%s) в log домена (%s)\n" diff --git a/po/vi.gmo b/po/vi.gmo index ec620fa0..059f1032 100644 Binary files a/po/vi.gmo and b/po/vi.gmo differ diff --git a/po/vi.po b/po/vi.po index 784b5e62..3eec28cc 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: partclone-0.2.61\n" -"Report-Msgid-Bugs-To: thomas@nchc.org.tw\n" -"POT-Creation-Date: 2023-10-04 17:06+0800\n" +"Report-Msgid-Bugs-To: thomas@clonezilla.org\n" +"POT-Creation-Date: 2024-06-11 14:36+0800\n" "PO-Revision-Date: 2013-06-13 09:03+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -113,174 +113,174 @@ msgstr "Thời gian tổng cộng: %s Còn lại: %s " msgid "Ave. Rate: %6.2f%s/min" msgstr "Tốc độ tb: %6.2f%s/phút, " -#: src/partclone.c:1905 +#: src/partclone.c:1906 #, c-format msgid "Partclone v%s http://partclone.org\n" msgstr "Partclone phiên bản %s \n" -#: src/partclone.c:1907 +#: src/partclone.c:1908 #, c-format msgid "Starting to check image (%s)\n" msgstr "Đang kiểm tra ảnh (%s)\n" -#: src/partclone.c:1910 +#: src/partclone.c:1911 #, fuzzy, c-format msgid "Starting to clone device (%s) to compressed image (%s)\n" msgstr "Bắt đầu nhân bản thiết bị (%s) thành ảnh (%s)\n" -#: src/partclone.c:1912 +#: src/partclone.c:1913 #, c-format msgid "Starting to clone device (%s) to image (%s)\n" msgstr "Bắt đầu nhân bản thiết bị (%s) thành ảnh (%s)\n" -#: src/partclone.c:1915 +#: src/partclone.c:1916 #, fuzzy, c-format msgid "Starting to restore image (%s) to block files (%s)\n" msgstr "Bắt đầu phục hồi ảnh (%s) vào thiết bị (%s)\n" -#: src/partclone.c:1917 +#: src/partclone.c:1918 #, c-format msgid "Starting to restore image (%s) to device (%s)\n" msgstr "Bắt đầu phục hồi ảnh (%s) vào thiết bị (%s)\n" -#: src/partclone.c:1919 +#: src/partclone.c:1920 #, c-format msgid "Starting to back up device (%s) to device (%s)\n" msgstr "Bắt đầu sao lưu dự phòng thiết bị (%s) vào thiết bị (%s)\n" -#: src/partclone.c:1921 +#: src/partclone.c:1922 #, c-format msgid "Starting to map device (%s) to domain log (%s)\n" msgstr "Bắt đầu ánh xạ thiết bị (%s) vào nhật ký tên miền (%s)\n" -#: src/partclone.c:1924 +#: src/partclone.c:1925 #, c-format msgid "Starting to dd image (%s) to block files (%s)\n" msgstr "Bắt đầu với hình ảnh dd (%s) để chặn tệp (%s)\n" -#: src/partclone.c:1926 +#: src/partclone.c:1927 #, c-format msgid "Starting to clone/restore (%s) to (%s) with dd mode\n" msgstr "Bắt đầu nhân bản thiết bị (%s) thành ảnh (%s)\n" -#: src/partclone.c:1928 +#: src/partclone.c:1929 #, c-format msgid "Showing info of image (%s)\n" msgstr "Hiển thị thông tin của hình ảnh (%s)\n" -#: src/partclone.c:1930 +#: src/partclone.c:1931 msgid "Unknown mode\n" msgstr "" -#: src/partclone.c:1950 +#: src/partclone.c:1951 #, c-format msgid "File system: %s\n" msgstr "Hê thống tập tin: %s\n" -#: src/partclone.c:1953 +#: src/partclone.c:1954 #, c-format msgid "Device size: %s = %llu Blocks\n" msgstr "Kích thước thiết bị: %s = %llu Khối\n" -#: src/partclone.c:1956 +#: src/partclone.c:1957 #, c-format msgid "Space in use: %s = %llu Blocks\n" msgstr "Dung lượng đã dùng: %s = %llu Khối\n" -#: src/partclone.c:1959 +#: src/partclone.c:1960 #, c-format msgid "Free Space: %s = %llu Blocks\n" msgstr "Dung lượng còn trống: %s = %llu Khối\n" -#: src/partclone.c:1961 +#: src/partclone.c:1962 #, c-format msgid "Block size: %i Byte\n" msgstr "Kích thước khối: %i Byte\n" -#: src/partclone.c:1962 +#: src/partclone.c:1963 #, fuzzy, c-format msgid "Used Blocks in Super-Block: %llu Blocks\n" msgstr "Dung lượng đã dùng: %s = %llu Khối\n" -#: src/partclone.c:1975 +#: src/partclone.c:1976 #, c-format msgid "image format: %04d\n" msgstr "định dạng hình ảnh: %04d\n" -#: src/partclone.c:1979 src/partclone.c:1986 +#: src/partclone.c:1980 src/partclone.c:1987 #, c-format msgid "created on a: %s\n" msgstr "được tạo vào: %s\n" -#: src/partclone.c:1981 src/partclone.c:1989 +#: src/partclone.c:1982 src/partclone.c:1990 #, c-format msgid "with partclone: %s\n" msgstr "với partclone: %s\n" -#: src/partclone.c:1985 +#: src/partclone.c:1986 #, c-format msgid "%d bits platform" msgstr "nền tảng %d bit" -#: src/partclone.c:1988 +#: src/partclone.c:1989 #, c-format msgid "v%s" msgstr "v%s" -#: src/partclone.c:1992 +#: src/partclone.c:1993 #, c-format msgid "bitmap mode: %s\n" msgstr "chế độ bản đồ bit: %s\n" -#: src/partclone.c:1994 +#: src/partclone.c:1995 #, c-format msgid "checksum algo: %s\n" msgstr "thuật toán tổng kiểm tra: %s\n" -#: src/partclone.c:1998 src/partclone.c:2007 +#: src/partclone.c:1999 src/partclone.c:2008 #, c-format msgid "checksum size: %s\n" msgstr "kích thước tổng kiểm tra: %s\n" -#: src/partclone.c:2000 src/partclone.c:2010 +#: src/partclone.c:2001 src/partclone.c:2011 #, c-format msgid "blocks/checksum: %s\n" msgstr "khối/tổng kiểm tra: %s\n" -#: src/partclone.c:2002 src/partclone.c:2012 +#: src/partclone.c:2003 src/partclone.c:2013 #, c-format msgid "reseed checksum: %s\n" msgstr "tổng kiểm tra đã gieo lại: %s\n" -#: src/partclone.c:2012 +#: src/partclone.c:2013 msgid "yes" msgstr "" -#: src/partclone.c:2012 +#: src/partclone.c:2013 msgid "no" msgstr "" -#: src/partclone.c:2025 +#: src/partclone.c:2026 #, c-format msgid "Partclone successfully checked the image (%s)\n" msgstr "Partclone đã kiểm tra ảnh (%s) thành công\n" -#: src/partclone.c:2027 +#: src/partclone.c:2028 #, c-format msgid "Partclone successfully cloned the device (%s) to the image (%s)\n" msgstr "Partclone đã nhân bản thành công thiết bị (%s) thành ảnh (%s)\n" -#: src/partclone.c:2029 +#: src/partclone.c:2030 #, c-format msgid "Partclone successfully restored the image (%s) to the device (%s)\n" msgstr "Partclone đã phục hồi thành công ảnh (%s) vào thiết bị (%s)\n" -#: src/partclone.c:2031 +#: src/partclone.c:2032 #, c-format msgid "Partclone successfully cloned the device (%s) to the device (%s)\n" msgstr "Partclone đã nhân bản thành công thiết bị (%s) vào thiết bị (%s)\n" -#: src/partclone.c:2033 +#: src/partclone.c:2034 #, c-format msgid "Partclone successfully mapped the device (%s) to the domain log (%s)\n" msgstr "" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index 754cfd22..66e8f00e 100644 Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ diff --git a/po/zh_CN.po b/po/zh_CN.po index 61de9c1b..f3f5c698 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: Partclone 0.2.51\n" -"Report-Msgid-Bugs-To: thomas@nchc.org.tw\n" -"POT-Creation-Date: 2023-10-04 17:06+0800\n" +"Report-Msgid-Bugs-To: thomas@clonezilla.org\n" +"POT-Creation-Date: 2024-06-11 14:36+0800\n" "PO-Revision-Date: 2007-11-01 11:35+0800\n" "Last-Translator: Peter Dave Hello\n" "Language-Team: Peter Dave Hello\n" @@ -109,174 +109,174 @@ msgstr "全部时间:%s 剩余时间: %s " msgid "Ave. Rate: %6.2f%s/min" msgstr "平均速率:%6.2f%s/min" -#: src/partclone.c:1905 +#: src/partclone.c:1906 #, c-format msgid "Partclone v%s http://partclone.org\n" msgstr "" -#: src/partclone.c:1907 +#: src/partclone.c:1908 #, c-format msgid "Starting to check image (%s)\n" msgstr "开始检查镜像 (%s)\n" -#: src/partclone.c:1910 +#: src/partclone.c:1911 #, fuzzy, c-format msgid "Starting to clone device (%s) to compressed image (%s)\n" msgstr "开始备份 装置 (%s) 到 镜像 (%s)\n" -#: src/partclone.c:1912 +#: src/partclone.c:1913 #, c-format msgid "Starting to clone device (%s) to image (%s)\n" msgstr "开始备份 装置 (%s) 到 镜像 (%s)\n" -#: src/partclone.c:1915 +#: src/partclone.c:1916 #, fuzzy, c-format msgid "Starting to restore image (%s) to block files (%s)\n" msgstr "开始恢复 镜像 (%s) 到 装置 (%s)\n" -#: src/partclone.c:1917 +#: src/partclone.c:1918 #, c-format msgid "Starting to restore image (%s) to device (%s)\n" msgstr "开始恢复 镜像 (%s) 到 装置 (%s)\n" -#: src/partclone.c:1919 +#: src/partclone.c:1920 #, c-format msgid "Starting to back up device (%s) to device (%s)\n" msgstr "开始备份 装置 (%s) 到 装置 (%s)\n" -#: src/partclone.c:1921 +#: src/partclone.c:1922 #, c-format msgid "Starting to map device (%s) to domain log (%s)\n" msgstr "开始输出 装置 (%s)块 到 资料文件 (%s)\n" -#: src/partclone.c:1924 +#: src/partclone.c:1925 #, fuzzy, c-format msgid "Starting to dd image (%s) to block files (%s)\n" msgstr "开始恢复 镜像 (%s) 到 装置 (%s)\n" -#: src/partclone.c:1926 +#: src/partclone.c:1927 #, fuzzy, c-format msgid "Starting to clone/restore (%s) to (%s) with dd mode\n" msgstr "开始备份 装置 (%s) 到 镜像 (%s)\n" -#: src/partclone.c:1928 +#: src/partclone.c:1929 #, fuzzy, c-format msgid "Showing info of image (%s)\n" msgstr "开始检查镜像 (%s)\n" -#: src/partclone.c:1930 +#: src/partclone.c:1931 msgid "Unknown mode\n" msgstr "" -#: src/partclone.c:1950 +#: src/partclone.c:1951 #, c-format msgid "File system: %s\n" msgstr "文件系统: %s\n" -#: src/partclone.c:1953 +#: src/partclone.c:1954 #, c-format msgid "Device size: %s = %llu Blocks\n" msgstr "装置大小: %s = %llu Blocks\n" -#: src/partclone.c:1956 +#: src/partclone.c:1957 #, c-format msgid "Space in use: %s = %llu Blocks\n" msgstr "装置使用到空间: %s = %llu Blocks\n" -#: src/partclone.c:1959 +#: src/partclone.c:1960 #, c-format msgid "Free Space: %s = %llu Blocks\n" msgstr "剩余空间: %s = %llu Blocks\n" -#: src/partclone.c:1961 +#: src/partclone.c:1962 #, c-format msgid "Block size: %i Byte\n" msgstr "装置块大小: %i Byte\n" -#: src/partclone.c:1962 +#: src/partclone.c:1963 #, fuzzy, c-format msgid "Used Blocks in Super-Block: %llu Blocks\n" msgstr "装置使用到空间: %s = %llu Blocks\n" -#: src/partclone.c:1975 +#: src/partclone.c:1976 #, c-format msgid "image format: %04d\n" msgstr "圖像格式: %04d\n" -#: src/partclone.c:1979 src/partclone.c:1986 +#: src/partclone.c:1980 src/partclone.c:1987 #, c-format msgid "created on a: %s\n" msgstr "創建於: %s\n" -#: src/partclone.c:1981 src/partclone.c:1989 +#: src/partclone.c:1982 src/partclone.c:1990 #, c-format msgid "with partclone: %s\n" msgstr "使用部分克隆: %s\n" -#: src/partclone.c:1985 +#: src/partclone.c:1986 #, c-format msgid "%d bits platform" msgstr "%d 位平台" -#: src/partclone.c:1988 +#: src/partclone.c:1989 #, c-format msgid "v%s" msgstr "v%s" -#: src/partclone.c:1992 +#: src/partclone.c:1993 #, c-format msgid "bitmap mode: %s\n" msgstr "位圖模式: %s\n" -#: src/partclone.c:1994 +#: src/partclone.c:1995 #, c-format msgid "checksum algo: %s\n" msgstr "" -#: src/partclone.c:1998 src/partclone.c:2007 +#: src/partclone.c:1999 src/partclone.c:2008 #, c-format msgid "checksum size: %s\n" msgstr "校驗和大小: %s\n" -#: src/partclone.c:2000 src/partclone.c:2010 +#: src/partclone.c:2001 src/partclone.c:2011 #, c-format msgid "blocks/checksum: %s\n" msgstr "" -#: src/partclone.c:2002 src/partclone.c:2012 +#: src/partclone.c:2003 src/partclone.c:2013 #, c-format msgid "reseed checksum: %s\n" msgstr "" -#: src/partclone.c:2012 +#: src/partclone.c:2013 msgid "yes" msgstr "" -#: src/partclone.c:2012 +#: src/partclone.c:2013 msgid "no" msgstr "" -#: src/partclone.c:2025 +#: src/partclone.c:2026 #, c-format msgid "Partclone successfully checked the image (%s)\n" msgstr "检查镜像 (%s) 完成\n" -#: src/partclone.c:2027 +#: src/partclone.c:2028 #, c-format msgid "Partclone successfully cloned the device (%s) to the image (%s)\n" msgstr "备份 装置 (%s) 到 镜像 (%s) 完成\n" -#: src/partclone.c:2029 +#: src/partclone.c:2030 #, c-format msgid "Partclone successfully restored the image (%s) to the device (%s)\n" msgstr "恢复 镜像 (%s) 到 装置 (%s) 完成\n" -#: src/partclone.c:2031 +#: src/partclone.c:2032 #, c-format msgid "Partclone successfully cloned the device (%s) to the device (%s)\n" msgstr "备份 装置 (%s) 到 装置 (%s) 完成\n" -#: src/partclone.c:2033 +#: src/partclone.c:2034 #, c-format msgid "Partclone successfully mapped the device (%s) to the domain log (%s)\n" msgstr "输出装置 (%s) 块信息 到 数据文件 (%s) 完成\n" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index 8eeb9fa7..eacf0cb0 100644 Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ diff --git a/po/zh_TW.po b/po/zh_TW.po index 3719e989..255702db 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Partclone 0.2.51\n" -"Report-Msgid-Bugs-To: thomas@nchc.org.tw\n" -"POT-Creation-Date: 2023-10-04 17:06+0800\n" +"Report-Msgid-Bugs-To: thomas@clonezilla.org\n" +"POT-Creation-Date: 2024-06-11 14:36+0800\n" "PO-Revision-Date: 2007-11-01 11:35+0800\n" "Last-Translator: Yu-Chin Tsai \n" "Language-Team: Chinese (traditional) \n" @@ -111,174 +111,174 @@ msgstr "全部時間:%s 剩餘時間: %s " msgid "Ave. Rate: %6.2f%s/min" msgstr "平均速率:%6.2f%s/min" -#: src/partclone.c:1905 +#: src/partclone.c:1906 #, c-format msgid "Partclone v%s http://partclone.org\n" msgstr "" -#: src/partclone.c:1907 +#: src/partclone.c:1908 #, c-format msgid "Starting to check image (%s)\n" msgstr "開始檢查印象檔 (%s)\n" -#: src/partclone.c:1910 +#: src/partclone.c:1911 #, fuzzy, c-format msgid "Starting to clone device (%s) to compressed image (%s)\n" msgstr "開始備份 裝置 (%s) 到 印象檔 (%s)\n" -#: src/partclone.c:1912 +#: src/partclone.c:1913 #, c-format msgid "Starting to clone device (%s) to image (%s)\n" msgstr "開始備份 裝置 (%s) 到 印象檔 (%s)\n" -#: src/partclone.c:1915 +#: src/partclone.c:1916 #, fuzzy, c-format msgid "Starting to restore image (%s) to block files (%s)\n" msgstr "開始還原 印象檔 (%s) 到 裝置 (%s)\n" -#: src/partclone.c:1917 +#: src/partclone.c:1918 #, c-format msgid "Starting to restore image (%s) to device (%s)\n" msgstr "開始還原 印象檔 (%s) 到 裝置 (%s)\n" -#: src/partclone.c:1919 +#: src/partclone.c:1920 #, c-format msgid "Starting to back up device (%s) to device (%s)\n" msgstr "開始備份 裝置 (%s) 到 裝置 (%s)\n" -#: src/partclone.c:1921 +#: src/partclone.c:1922 #, c-format msgid "Starting to map device (%s) to domain log (%s)\n" msgstr "開始輸出 裝置 (%s)區塊 到 資料檔 (%s)\n" -#: src/partclone.c:1924 +#: src/partclone.c:1925 #, fuzzy, c-format msgid "Starting to dd image (%s) to block files (%s)\n" msgstr "開始還原 印象檔 (%s) 到 裝置 (%s)\n" -#: src/partclone.c:1926 +#: src/partclone.c:1927 #, fuzzy, c-format msgid "Starting to clone/restore (%s) to (%s) with dd mode\n" msgstr "開始備份 裝置 (%s) 到 印象檔 (%s)\n" -#: src/partclone.c:1928 +#: src/partclone.c:1929 #, fuzzy, c-format msgid "Showing info of image (%s)\n" msgstr "開始檢查印象檔 (%s)\n" -#: src/partclone.c:1930 +#: src/partclone.c:1931 msgid "Unknown mode\n" msgstr "" -#: src/partclone.c:1950 +#: src/partclone.c:1951 #, c-format msgid "File system: %s\n" msgstr "檔案系統: %s\n" -#: src/partclone.c:1953 +#: src/partclone.c:1954 #, fuzzy, c-format msgid "Device size: %s = %llu Blocks\n" msgstr "裝置大小: %s = %lld Blocks\n" -#: src/partclone.c:1956 +#: src/partclone.c:1957 #, fuzzy, c-format msgid "Space in use: %s = %llu Blocks\n" msgstr "裝置使用到空間: %s = %lld Blocks\n" -#: src/partclone.c:1959 +#: src/partclone.c:1960 #, fuzzy, c-format msgid "Free Space: %s = %llu Blocks\n" msgstr "剩餘空間: %s = %lld Blocks\n" -#: src/partclone.c:1961 +#: src/partclone.c:1962 #, c-format msgid "Block size: %i Byte\n" msgstr "裝置區塊大小: %i Byte\n" -#: src/partclone.c:1962 +#: src/partclone.c:1963 #, fuzzy, c-format msgid "Used Blocks in Super-Block: %llu Blocks\n" msgstr "裝置使用到空間: %s = %lld Blocks\n" -#: src/partclone.c:1975 +#: src/partclone.c:1976 #, c-format msgid "image format: %04d\n" msgstr "" -#: src/partclone.c:1979 src/partclone.c:1986 +#: src/partclone.c:1980 src/partclone.c:1987 #, c-format msgid "created on a: %s\n" msgstr "" -#: src/partclone.c:1981 src/partclone.c:1989 +#: src/partclone.c:1982 src/partclone.c:1990 #, c-format msgid "with partclone: %s\n" msgstr "" -#: src/partclone.c:1985 +#: src/partclone.c:1986 #, c-format msgid "%d bits platform" msgstr "" -#: src/partclone.c:1988 +#: src/partclone.c:1989 #, fuzzy, c-format msgid "v%s" msgstr "%s" -#: src/partclone.c:1992 +#: src/partclone.c:1993 #, c-format msgid "bitmap mode: %s\n" msgstr "" -#: src/partclone.c:1994 +#: src/partclone.c:1995 #, c-format msgid "checksum algo: %s\n" msgstr "" -#: src/partclone.c:1998 src/partclone.c:2007 +#: src/partclone.c:1999 src/partclone.c:2008 #, fuzzy, c-format msgid "checksum size: %s\n" msgstr "裝置區塊大小: %i Byte\n" -#: src/partclone.c:2000 src/partclone.c:2010 +#: src/partclone.c:2001 src/partclone.c:2011 #, c-format msgid "blocks/checksum: %s\n" msgstr "" -#: src/partclone.c:2002 src/partclone.c:2012 +#: src/partclone.c:2003 src/partclone.c:2013 #, c-format msgid "reseed checksum: %s\n" msgstr "" -#: src/partclone.c:2012 +#: src/partclone.c:2013 msgid "yes" msgstr "" -#: src/partclone.c:2012 +#: src/partclone.c:2013 msgid "no" msgstr "" -#: src/partclone.c:2025 +#: src/partclone.c:2026 #, c-format msgid "Partclone successfully checked the image (%s)\n" msgstr "檢查印象檔 (%s) 完成\n" -#: src/partclone.c:2027 +#: src/partclone.c:2028 #, c-format msgid "Partclone successfully cloned the device (%s) to the image (%s)\n" msgstr "備份 裝置 (%s) 到 印象檔 (%s) 完成\n" -#: src/partclone.c:2029 +#: src/partclone.c:2030 #, c-format msgid "Partclone successfully restored the image (%s) to the device (%s)\n" msgstr "還原 印象檔 (%s) 到 裝置 (%s) 完成\n" -#: src/partclone.c:2031 +#: src/partclone.c:2032 #, c-format msgid "Partclone successfully cloned the device (%s) to the device (%s)\n" msgstr "備份 裝置 (%s) 到 裝置 (%s) 完成\n" -#: src/partclone.c:2033 +#: src/partclone.c:2034 #, c-format msgid "Partclone successfully mapped the device (%s) to the domain log (%s)\n" msgstr "輸出裝置 (%s) 區塊資訊 到 資料檔 (%s) 完成\n" diff --git a/src/version.h b/src/version.h index 16aebaca..4800d680 100644 --- a/src/version.h +++ b/src/version.h @@ -3,5 +3,5 @@ * WHETHER THEY ARE BUILT BY OTHERS OR DURING DEVELOPMENT OR FOR THE * OFFICIAL PARTCLONE RELEASES. */ -#define git_version "d67a0d03902fde65962102746b1fa09bf4496033" +#define git_version "ed46e08c0ac4faefb399100579615f438d65c26d" diff --git a/toolbox b/toolbox index 4102cd01..4860495b 100755 --- a/toolbox +++ b/toolbox @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash ## toolbox for the Partclone ## initial copied from VLC @@ -22,11 +22,68 @@ recognized flags are: --update-po update translation files --update-log update Changelog files from git --update-btrfs update source of btrfs + eg: + ./toolbox --update-btrfs /tmp/partclone /tmp/btrfs-progs v6.8 --update-version generate src/version.h EOF exit 1 } +## +## update btrfs +## + +btrfs_update(){ + partcloneGitRepo=$1 + btrfsprogsGitRepo=$2 + tag=$3 + echo $@ $tag $partcloneGitRepo $btrfsprogsGitRepo + + pushd $partcloneGitRepo/src/ + btrfs_files=$(find btrfs -name "*.h" -o -name "*.c") + popd + echo $btrfs_files + + pushd $btrfsprogsGitRepo + + git checkout -b $tag $tag + ./autogen.sh + ./configure --disable-documentation + make + + cat libbtrfs/version.h + + set -e + for source_file in $btrfs_files; do + echo $source_file + btrfs_file=$(echo $source_file | sed s/^btrfs//) + source_file_path=$(echo "$partcloneGitRepo/src/$source_file" | sed "s#//#/#g") + btrfs_file_path=$(echo "$btrfsprogsGitRepo/$btrfs_file" | sed "s#//#/#g") + + if test -f "$btrfs_file_path"; then + source_md5=$(md5sum -z $source_file_path |sed 's/ .*//') + btrfs_md5=$(md5sum -z $btrfs_file_path |sed 's/ .*//') + + if [ "X$source_md5" != "X$btrfs_md5" ]; then + echo "cp $btrfs_file_path $source_file_path" + cp $btrfs_file_path $source_file_path + else + echo "keep $source_file" + fi + echo "MD5: $source_md5 : $btrfs_md5" + else + echo "######" + echo "can't find $source_file in $btrfs_file_path" + echo "manually merge file!" + find $btrfsprogsGitRepo -name `basename $source_file` + echo "######" + fi + + done + + popd +} + ### ### argument check ### @@ -74,13 +131,13 @@ fi ## ## Update the source of btrfs ## + if test "${action}" = "btrfs" then - BTRFS_SOURCE_TXT="btrfs_source.txt" - - echo "rsync -av --files-from=$BTRFS_SOURCE_TXT ../btrfs-progs/ ./src/btrfs/" - + echo "btrfs sync parameters $@" + btrfs_update $@ fi + ## ## update Changelog from SVN ##