diff --git a/Application/Info.plist b/Application/Info.plist index 1494744..9fc076e 100644 --- a/Application/Info.plist +++ b/Application/Info.plist @@ -33,7 +33,7 @@ LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright - Developed by SBAREX (2019-2023). + Developed by SBAREX (2019-2024). NSMainStoryboardFile Storyboard NSPrincipalClass @@ -422,6 +422,22 @@ + + UTTypeConformsTo + + public.item + dyn.ah62d4rv4ge80c25g + + UTTypeIdentifier + com.steampowered.appmanifest + UTTypeTagSpecification + + public.filename-extension + + acf + + + UTTypeConformsTo @@ -490,6 +506,22 @@ + + UTTypeConformsTo + + public.item + dyn.ah62d4rv4ge80c65ysm1u + + UTTypeIdentifier + build.astro.files + UTTypeTagSpecification + + public.filename-extension + + astro + + + UTTypeConformsTo @@ -566,6 +598,7 @@ dyn.ah62d4rv4ge81k3x0qf3hg dyn.ah62d4rv4ge81k3u + dyn.ah62d4rv4ge80u25q public.item UTTypeIdentifier @@ -576,6 +609,7 @@ tf tfvars + hcl @@ -705,11 +739,18 @@ public.item dyn.ah62d4rv4ge80e2p4qz0a + dyn.ah62d4rv4ge80e8xq UTTypeIdentifier org.bazel.source UTTypeTagSpecification - + + public.filename-extension + + bzl + bazel + + UTTypeConformsTo @@ -1128,6 +1169,22 @@ + + UTTypeConformsTo + + public.item + dyn.ah62d4rv4ge8028k + + UTTypeIdentifier + org.lilypond.files + UTTypeTagSpecification + + public.filename-extension + + ly + + + UTTypeConformsTo diff --git a/Application/resources/settings.yaml b/Application/resources/settings.yaml index 8a94e0b..592005b 100644 --- a/Application/resources/settings.yaml +++ b/Application/resources/settings.yaml @@ -10,6 +10,12 @@ UTIs: com.adobe.acrobat.sequ: *xml dyn.ah62d4rv4ge81g3pvsy: *xml + # .acf + com.steampowered.appmanifest: + syntax: txt + dyn.ah62d4rv4ge80c25g: + syntax: txt + com.adobe.edn: syntax: clojure @@ -44,6 +50,9 @@ UTIs: com.google.earth.kml: *xml com.jetbrain.source: *xml + com.nutstore.down: + syntax: md + com.microsoft.typescript: syntax: typescript dyn.ah62d4rv4ge80g7dx: @@ -283,6 +292,9 @@ UTIs: # .bazel dyn.ah62d4rv4ge80e2p4qz0a: syntax: txt + # .bzl + dyn.ah62d4rv4ge80e8xq: + syntax: txr # .code-workspace dyn.ah62d4rv4ge80g55eqy01s55wrr31a2pdqy: @@ -341,6 +353,9 @@ UTIs: # .tf dyn.ah62d4rv4ge81k3u: syntax: yaml + # .hcl + dyn.ah62d4rv4ge80u25q: + syntax: yaml # .sage dyn.ah62d4rv4ge81g2phqy: @@ -360,6 +375,18 @@ UTIs: dyn.ah62d4rv4ge80k52: syntax: txt + #.astro + build.astro.files: + syntax: jsx + dyn.ah62d4rv4ge80c65ysm1u: + syntax: jsx + + # lilypond .ly + org.lilypond.files: + syntax: ly + dyn.ah62d4rv4ge8028k: + syntax: ly + extensions: _plist*: &plist syntax: xml @@ -371,6 +398,9 @@ extensions: _typescript*: &typescript syntax: typescript + acf: + syntax: txt + ado: syntax: txt @@ -378,9 +408,14 @@ extensions: syntax: autoit a3x: syntax: autoit + + astro: + syntax: jsx bazel: syntax: txt + bzl: + syntax: txt code-workspace: syntax: json @@ -553,3 +588,5 @@ extensions: syntax: yaml tf: syntax: yaml + hcl: + syntax: yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 6de6a64..5329942 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,21 @@ Changelog ======= +### 2.1.21 (70) + +New Features: +- Update Highlight to release 4.10. +- Update Dos2Unix to release 7.5.2. +- Support for Steam app manifest files (`.acf`) _as plain text_. +- Support fo Lilypond files (`.ly`). +- Experimental support of Astro files (`.astro`) _as JSX_. + +Bugfix: +- Better support for bazel files. +- Fixed `cmake` support. +- Fixed support for `lua` files. +- Fixed support for `md` files. +- Extended support for Terraform files to the extension `.hcl` (_ as YAML_) ### 2.1.20 (69) New features: diff --git a/QLExtension/Info.plist b/QLExtension/Info.plist index ada915d..ef99e8e 100644 --- a/QLExtension/Info.plist +++ b/QLExtension/Info.plist @@ -32,6 +32,7 @@ QLSupportedContentTypes + build.astro.files com.adobe.acrobat.sequ com.adobe.actionscript com.adobe.coldfusion @@ -88,6 +89,7 @@ com.microsoft.visual-basic com.microsoft.xaml com.netscape.javascript-source + com.nutstore.down com.oracle.sql com.sas.source com.sass-lang.sass @@ -119,7 +121,7 @@ org.bash.source org.bazel.source org.clojure - org.cmake.makefile + org.cmake.cmake org.clojure.script org.cocoapods.podspec org.codehaus.groovy-source @@ -152,6 +154,7 @@ org.kotlinlang.source org.latex-project.latex org.lesscss.less + org.lilypond.files org.lua.lua org.lua.lua-source org.microsoft.inf @@ -263,6 +266,7 @@ public.java public.json public.ksh-script + public.lua-source public.make-source public.objective-c-source public.objective-c-plus-plus-source @@ -366,6 +370,11 @@ dyn.ah62d4rv4ge8042ppqzxgw5df dyn.ah62d4rv4ge8046de dyn.ah62d4rv4ge80y65r + dyn.ah62d4rv4ge80e8xq + dyn.ah62d4rv4ge80c25g + dyn.ah62d4rv4ge80u25q + dyn.ah62d4rv4ge80c65ysm1u + dyn.ah62d4rv4ge8028k QLSupportsSearchableItems @@ -376,6 +385,6 @@ $(PRODUCT_MODULE_NAME).PreviewViewController NSHumanReadableCopyright - Developed by SBAREX (2019-2023). + Developed by SBAREX (2019-2024). diff --git a/README.md b/README.md index 007704f..cf3d67e 100644 --- a/README.md +++ b/README.md @@ -125,6 +125,7 @@ The application can also handle some [plain files](#plain-files) **without exten - AppleScript (`.scpt`, `.applescript`, `.ascr`) _automatically decompiled with `osadecompile`_ - Apple shell script files (`.command`) - Assembler source files (`.asm`, `.s79`) +- Astro files (`.astro`) _as JSX_. - Autolit files (`.au3`, `.a3x`) - Azkaban flow files (`.flow`) as _`YAML`_ - ATL files (`.atl`) @@ -191,6 +192,7 @@ The application can also handle some [plain files](#plain-files) **without exten - Korn Shell script files (`.ksh`) - Kotlin source files (`.kt`, `.kts`) - LESS stylesheet (`.less`) +- Lilypond files (`.ly`)x1 - Lisp source files (`.lisp`, `.lsp`, `.asd`, `.el`) - Logos source files (`.xm`) - Lua source files (`.lua`) @@ -240,12 +242,13 @@ The application can also handle some [plain files](#plain-files) **without exten - SQL files (`.sql`) - Standard ML source files (`.ml`) - Stata files (`.do`, `.ado`) _as plain text_ +- Steam app manifest files (`.acf`) _as plain text_. - Svelte (`.svelte`) _as `HTML`_ - Swift source files (`.swift`) - Symfony Twig files (`.twig`) - TCL source files (`.tcl`) - Tenex C Shell script files (`.tcsh`) -- Terraform files (`.tfvars`, `.tf`) _as `YAML`_ +- Terraform files (`.tfvars`, `.tf`, `.hcl`) _as `YAML`_ - TeX and LaTeX files (`.tex`, `.sty`, `.cls`, `.latex`, `.ltx`, `.texi`, `.ctx`, `.sty`) - Text files (`.txt`, `.text`) - TOML files (`.toml`) diff --git a/SourceCodeSyntaxHighlight.xcodeproj/project.pbxproj b/SourceCodeSyntaxHighlight.xcodeproj/project.pbxproj index 0e7e6c0..35022af 100644 --- a/SourceCodeSyntaxHighlight.xcodeproj/project.pbxproj +++ b/SourceCodeSyntaxHighlight.xcodeproj/project.pbxproj @@ -1454,7 +1454,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 1300; - LastUpgradeCheck = 1500; + LastUpgradeCheck = 1520; ORGANIZATIONNAME = sbarex; TargetAttributes = { 83592344235599F6001506B6 = { @@ -1781,6 +1781,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -1846,6 +1847,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -1907,7 +1909,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 69; + CURRENT_PROJECT_VERSION = 70; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -1926,7 +1928,7 @@ "$(inherited)", "\"$(BUILT_PRODUCTS_DIR)/highlight\"", ); - MARKETING_VERSION = 2.1.20; + MARKETING_VERSION = 2.1.21; PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.SourceCodeSyntaxHighlight; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1944,7 +1946,7 @@ CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 69; + CURRENT_PROJECT_VERSION = 70; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -1963,7 +1965,7 @@ "$(inherited)", "\"$(BUILT_PRODUCTS_DIR)/highlight\"", ); - MARKETING_VERSION = 2.1.20; + MARKETING_VERSION = 2.1.21; OTHER_CODE_SIGN_FLAGS = "--timestamp"; PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.SourceCodeSyntaxHighlight; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2040,7 +2042,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 69; + CURRENT_PROJECT_VERSION = 70; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2050,7 +2052,7 @@ "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)_$(_BOOL_$(SKIP_INSTALL)))", ); LIBRARY_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/highlight\""; - MARKETING_VERSION = 2.1.20; + MARKETING_VERSION = 2.1.21; PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.SourceCodeSyntaxHighlight.XPCService; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2069,7 +2071,7 @@ CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 69; + CURRENT_PROJECT_VERSION = 70; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2079,7 +2081,7 @@ "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)_$(_BOOL_$(SKIP_INSTALL)))", ); LIBRARY_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/highlight\""; - MARKETING_VERSION = 2.1.20; + MARKETING_VERSION = 2.1.21; OTHER_CODE_SIGN_FLAGS = "--timestamp"; PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.SourceCodeSyntaxHighlight.XPCService; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2131,7 +2133,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 69; + CURRENT_PROJECT_VERSION = 70; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2144,7 +2146,7 @@ "$(inherited)", "@loader_path/../../../../Frameworks", ); - MARKETING_VERSION = 2.1.20; + MARKETING_VERSION = 2.1.21; PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.SourceCodeSyntaxHighlight.XPCRender; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2164,7 +2166,7 @@ CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 69; + CURRENT_PROJECT_VERSION = 70; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2177,7 +2179,7 @@ "$(inherited)", "@loader_path/../../../../Frameworks", ); - MARKETING_VERSION = 2.1.20; + MARKETING_VERSION = 2.1.21; OTHER_CODE_SIGN_FLAGS = "--timestamp"; PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.SourceCodeSyntaxHighlight.XPCRender; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/SourceCodeSyntaxHighlight.xcodeproj/xcshareddata/xcschemes/QLSourceSyntaxGUITest.xcscheme b/SourceCodeSyntaxHighlight.xcodeproj/xcshareddata/xcschemes/QLSourceSyntaxGUITest.xcscheme index 421dffb..e48cac0 100644 --- a/SourceCodeSyntaxHighlight.xcodeproj/xcshareddata/xcschemes/QLSourceSyntaxGUITest.xcscheme +++ b/SourceCodeSyntaxHighlight.xcodeproj/xcshareddata/xcschemes/QLSourceSyntaxGUITest.xcscheme @@ -1,6 +1,6 @@ CFBundleVersion $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright - Developed by SBAREX (2019-2023). + Developed by SBAREX (2019-2024). XPCService ServiceType diff --git a/XPCService/Info.plist b/XPCService/Info.plist index 6d67ad8..3d2b961 100644 --- a/XPCService/Info.plist +++ b/XPCService/Info.plist @@ -19,7 +19,7 @@ CFBundleVersion $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright - Developed by SBAREX (2019-2023). + Developed by SBAREX (2019-2024). XPCService ServiceType diff --git a/dos2unix/COPYING.txt b/dos2unix/COPYING.txt index 18ca1d0..602d53d 100644 --- a/dos2unix/COPYING.txt +++ b/dos2unix/COPYING.txt @@ -2,7 +2,7 @@ The dos2unix package is distributed under FreeBSD style license. See also https://www.freebsd.org/copyright/freebsd-license.html -------- -Copyright (C) 2009-2023 Erwin Waterlander +Copyright (C) 2009-2024 Erwin Waterlander Copyright (C) 1998 Christian Wurll Copyright (C) 1998 Bernd Johannes Wuebben Copyright (C) 1994-1995 Benjamin Lin. diff --git a/dos2unix/ChangeLog.txt b/dos2unix/ChangeLog.txt index 87c4ea9..4c0072a 100644 --- a/dos2unix/ChangeLog.txt +++ b/dos2unix/ChangeLog.txt @@ -1,3 +1,27 @@ +2024-01-22 Erwin Waterlander + * Version 7.5.2 + +2024-01-16 Erwin Waterlander + * common.c: Fixed use of uninitialized local variable 'TempPath' + in verbose mode. See https://sourceforge.net/p/dos2unix/bugs/20/ + Thanks to anonymous. + +2023-11-05 Erwin Waterlander + * Updated documentation about ASCII mode conversion. + Resolves https://sourceforge.net/p/dos2unix/feature-requests/8/ + Thanks to Tony Mancill. + +2023-10-25 Erwin Waterlander + * New flag 'e' for option -i, --info to print the line break + type of the last line. + +2023-10-11 Erwin Waterlander + * If option -i is used in combination with -e the line break + type of the last line is printed, or "noeol" if there is none. + +2023-09-26 Erwin Waterlander + * Changed URLs in manpages from http to https. + 2023-08-29 Erwin Waterlander * Version 7.5.1 diff --git a/dos2unix/NEWS.txt b/dos2unix/NEWS.txt index baae741..8270040 100644 --- a/dos2unix/NEWS.txt +++ b/dos2unix/NEWS.txt @@ -1,3 +1,9 @@ +2024-01-22: Version 7.5.2 + + * Dos2unix can print info about the line break type of the last line, + or indicate there is none. + * Updated documentation about ASCII mode conversion. + 2023-08-29: Version 7.5.1 * Fixed problem of converting a symbolic link target diff --git a/dos2unix/README.txt b/dos2unix/README.txt index 46d9d6e..4e8577a 100644 --- a/dos2unix/README.txt +++ b/dos2unix/README.txt @@ -59,7 +59,7 @@ HISTORY AUTHORS - Erwin Waterlander version 3.2 - 7.5.0 2009-2023 + Erwin Waterlander version 3.2 - 7.5.2 2009-2024 Christian Wurll version 3.1 1998 Bernd Johannes Wuebben version 3.0 1998 Benjamin Lin version 1.1 - 2.3 1994-1995 @@ -79,42 +79,43 @@ TRANSLATORS Catalan Jordi Mas i Hernàndez Version 7.4.4 Chinese (simplified) Tianze Wang Version 7.3.1 - 7.4.0 7.5.1 - Chinese (simplified) Boyuan Yang Version 7.5.0 + Chinese (simplified) Boyuan Yang Version 7.5.0 - 7.5.2 Chinese (traditional) mail6543210 Version 6.0.5 Chinese (traditional) Yi-Jyun Pan Version 7.4.2 - 7.5.1 Danish Thomas Pryds Version 6.0.5 - 6.0.6 Danish Joe Hansen Version 7.2.3 - 7.4.1 Dutch Erwin Waterlander Version 4.0 - 6.0.4 - Dutch Benno Schulenberg Version 6.0.5 - 7.4.2 + Dutch Benno Schulenberg Version 6.0.5 - 7.5.2 Esperanto Rugxulo Version 5.1 - 6.0.4 Esperanto Benno Schulenberg Version 6.0.5 - 7.3 Esperanto Felipe Castro Version 7.4.3 - French Frédéric Marchal Version 6.0.5 - 7.5.0 + French Frédéric Marchal Version 6.0.5 - 7.5.2 Friulian Fabio Tomat Version 7.4.2 Georgian Temuri Doghonadze Version 7.4.4 German Philipp Thomas Version 5.0 - 6.0.3, 7.0, 7.2.2 - 7.4.1 German Lars Wendler Version 6.0.4 German Mario Blättermann Version 6.0.6, 7.1 - 7.2 - German Roland Illig Version 7.4.2 - 7.5.0 + German Roland Illig Version 7.4.2 - 7.5.2 Hungarian Balázs Úr Version 6.0.5 - 7.2.3, 7.4.0 - 7.4.1 Hungarian Gabor Kelemen Version 7.3.4 Japanese Yasuaki Taniguchi Version 7.1.1 Japanese Takeshi Hamasaki Version 7.3.4 - 7.4.1 - Korean Seong-ho Cho Version 7.4.4 - 7.5.0 + Korean Seong-ho Cho Version 7.4.4 - 7.5.2 Norwegian Bokmaal Åka Sikrom Version 6.0.6 - 7.4.0 - Norwegian Bokmaal Johnny A. Solbu Version 7.5.0 - Polish Jakub Bogusz Version 6.0.5 - 7.5.0 - Romanian Remus-Gabriel Chelu Version 7.4.4 - 7.5.0 + Norwegian Bokmaal Johnny A. Solbu Version 7.5.0 - 7.5.2 + Polish Jakub Bogusz Version 6.0.5 - 7.5.2 + Romanian Remus-Gabriel Chelu Version 7.4.4 - 7.5.2 Russian Андрей Углик (Andrei Uhlik) Version 6.0.4 - Russian Yuri Kozlov Version 6.0.6 - 7.4.0 - Serbian Мирослав Николић Version 6.0.5 - 7.5.1 + Russian Yuri Kozlov Version 6.0.6 - 7.5.2 + Serbian Мирослав Николић Version 6.0.5 - 7.5.2 Spanish Julio A. Freyre-Gonzalez Version 5.3.1 - 6.0.4 Spanish Enrique Lazcorreta Puigmartí Version 6.0.6 - 7.3.1 - Swedish Sebastian Rasmussen Version 7.3.2 - 7.5.0 - Ukrainian Yuri Chornoivan Version 6.0.5 - 7.5.0 - Vietnamese Trần Ngọc Quân Version 6.0.5 - 7.5.0 + Swedish Sebastian Rasmussen Version 7.3.2 - 7.5.2 + Swedish Luna Jernberg Version 7.5.2 + Ukrainian Yuri Chornoivan Version 6.0.5 - 7.5.2 + Vietnamese Trần Ngọc Quân Version 6.0.5 - 7.5.2 Translation of the manual. See https://translationproject.org/domain/dos2unix-man.html @@ -127,17 +128,17 @@ TRANSLATORS Chinese (simplified) Boyuan Yang Version 7.5.0 Dutch Erwin Waterlander Version 5.1.1 - 6.0.4 Dutch Benno Schulenberg Version 6.0.5 - 7.3.3 - French Frédéric Marchal Version 6.0.5 - 7.5.0 - German Mario Blättermann Version 6.0.5 - 7.4.0 + French Frédéric Marchal Version 6.0.5 - 7.5.2 + German Mario Blättermann Version 6.0.5 - 7.5.2 German Roland Illig Version 7.4.2 - Korean Seong-ho Cho Version 7.4.4 - 7.5.0 - Polish Jakub Bogusz Version 6.0.5 - 7.5.0 - Romanian Remus-Gabriel Chelu Version 7.4.4 + Korean Seong-ho Cho Version 7.4.4 - 7.5.2 + Polish Jakub Bogusz Version 6.0.5 - 7.5.2 + Romanian Remus-Gabriel Chelu Version 7.4.4 - 7.5.2 Serbian Мирослав Николић Version 7.4.3 - 7.5.1 Spanish Julio A. Freyre-Gonzalez Version 5.3.1 - 6.0.4 Spanish Enrique Lazcorreta Puigmartí Version 6.0.6 - 7.2.1 - Swedish Sebastian Rasmussen Version 7.3.2 - 7.5.0 - Ukrainian Yuri Chornoivan Version 6.0.5 - 7.5.0 + Swedish Sebastian Rasmussen Version 7.3.2 - 7.5.2 + Ukrainian Yuri Chornoivan Version 6.0.5 - 7.5.2 ACKNOWLEDGEMENTS diff --git a/dos2unix/common.c b/dos2unix/common.c index b0479ed..03dfa96 100644 --- a/dos2unix/common.c +++ b/dos2unix/common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Erwin Waterlander + * Copyright (C) 2009-2024 Erwin Waterlander * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -649,7 +649,7 @@ void PrintUsage(const char *progname) #ifndef NO_CHOWN D2U_ANSI_FPRINTF(stdout,_(" --allow-chown allow file ownership change\n")); #endif - D2U_ANSI_FPRINTF(stdout,_(" -ascii convert only line breaks (default)\n")); + D2U_ANSI_FPRINTF(stdout,_(" -ascii default conversion mode\n")); D2U_ANSI_FPRINTF(stdout,_(" -iso conversion between DOS and ISO-8859-1 character set\n")); D2U_ANSI_FPRINTF(stdout,_(" -1252 use Windows code page 1252 (Western European)\n")); D2U_ANSI_FPRINTF(stdout,_(" -437 use DOS code page 437 (US) (default)\n")); @@ -1519,7 +1519,6 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn if (ipFlag->verbose) { D2U_UTF8_FPRINTF(stderr, "%s: ", progname); D2U_UTF8_FPRINTF(stderr, _("problems resolving symbolic link '%s'\n"), ipOutFN); - D2U_UTF8_FPRINTF(stderr, _(" output file remains in '%s'\n"), TempPath); } RetVal = -1; } @@ -2046,16 +2045,19 @@ void print_messages_info(const CFlag *pFlag, const char *infile, const char *pro } } -void printInfo(CFlag *ipFlag, const char *filename, int bomtype, unsigned int lb_dos, unsigned int lb_unix, unsigned int lb_mac) +void printInfo(CFlag *ipFlag, const char *filename, int bomtype, unsigned int lb_dos, unsigned int lb_unix, unsigned int lb_mac, int last_eol) { static int header_done = 0; + char eol[6]; if (ipFlag->file_info & INFO_CONVERT) { - if ((ipFlag->FromToMode == FROMTO_DOS2UNIX) && (lb_dos == 0)) + if ((ipFlag->FromToMode == FROMTO_DOS2UNIX) && (lb_dos == 0) && (! ipFlag->add_eol || last_eol == INFO_UNIX )) return; - if (((ipFlag->FromToMode == FROMTO_UNIX2DOS)||(ipFlag->FromToMode == FROMTO_UNIX2MAC)) && (lb_unix == 0)) + if ((ipFlag->FromToMode == FROMTO_UNIX2DOS) && (lb_unix == 0) && (! ipFlag->add_eol || last_eol == INFO_DOS )) return; - if ((ipFlag->FromToMode == FROMTO_MAC2UNIX) && (lb_mac == 0)) + if ((ipFlag->FromToMode == FROMTO_UNIX2MAC) && (lb_unix == 0) && (! ipFlag->add_eol || last_eol == INFO_MAC )) + return; + if ((ipFlag->FromToMode == FROMTO_MAC2UNIX) && (lb_mac == 0) && (! ipFlag->add_eol || last_eol == INFO_UNIX )) return; if ((ipFlag->Force == 0) && (ipFlag->status & BINARY_FILE)) return; @@ -2072,8 +2074,10 @@ void printInfo(CFlag *ipFlag, const char *filename, int bomtype, unsigned int lb D2U_UTF8_FPRINTF(stdout, " BOM "); if (ipFlag->file_info & INFO_TEXT) D2U_UTF8_FPRINTF(stdout, " TXTBIN"); + if ((ipFlag->add_eol && !(ipFlag->file_info & INFO_CONVERT)) || ipFlag->file_info & INFO_EOL) + D2U_UTF8_FPRINTF(stdout, " LASTLN"); if (*filename != '\0') { - if (ipFlag->file_info & INFO_DEFAULT) + if ((ipFlag->file_info & INFO_DEFAULT) || (ipFlag->file_info & INFO_EOL)) D2U_UTF8_FPRINTF(stdout, " "); D2U_UTF8_FPRINTF(stdout, "FILE"); } @@ -2084,6 +2088,20 @@ void printInfo(CFlag *ipFlag, const char *filename, int bomtype, unsigned int lb header_done = 1; } + switch (last_eol) { + case INFO_DOS: + strncpy(eol,"dos ",sizeof(eol)); + break; + case INFO_UNIX: + strncpy(eol,"unix ",sizeof(eol)); + break; + case INFO_MAC: + strncpy(eol,"mac ",sizeof(eol)); + break; + default: + strncpy(eol,"noeol",sizeof(eol)); + } + if (ipFlag->file_info & INFO_DOS) D2U_UTF8_FPRINTF(stdout, " %6u", lb_dos); if (ipFlag->file_info & INFO_UNIX) @@ -2098,13 +2116,15 @@ void printInfo(CFlag *ipFlag, const char *filename, int bomtype, unsigned int lb else D2U_UTF8_FPRINTF(stdout, " text "); } + if ((ipFlag->add_eol && !(ipFlag->file_info & INFO_CONVERT)) || ipFlag->file_info & INFO_EOL) + D2U_UTF8_FPRINTF(stdout, " %s ", eol); if (*filename != '\0') { const char *ptr; if ((ipFlag->file_info & INFO_NOPATH) && (((ptr=strrchr(filename,'/')) != NULL) || ((ptr=strrchr(filename,'\\')) != NULL)) ) ptr++; else ptr = filename; - if (ipFlag->file_info & INFO_DEFAULT) + if ((ipFlag->file_info & INFO_DEFAULT) || (ipFlag->file_info & INFO_EOL)) D2U_UTF8_FPRINTF(stdout, " "); D2U_UTF8_FPRINTF(stdout, "%s",ptr); } @@ -2122,6 +2142,7 @@ void FileInfoW(FILE* ipInF, CFlag *ipFlag, const char *filename, int bomtype, co unsigned int lb_dos = 0; unsigned int lb_unix = 0; unsigned int lb_mac = 0; + int last_eol = 0; ipFlag->status = 0; @@ -2135,18 +2156,24 @@ void FileInfoW(FILE* ipInF, CFlag *ipFlag, const char *filename, int bomtype, co } if (TempChar != 0x0a) { /* Not an LF */ PreviousChar = TempChar; - if (TempChar == 0x0d) /* CR */ + if (TempChar == 0x0d) { /* CR */ lb_mac++; + last_eol = INFO_MAC; + } else { + last_eol = 0; + } } else{ /* TempChar is an LF */ if ( PreviousChar == 0x0d ) { /* CR,LF pair. */ lb_dos++; lb_mac--; + last_eol = INFO_DOS; PreviousChar = TempChar; continue; } PreviousChar = TempChar; lb_unix++; /* Unix line end (LF). */ + last_eol = INFO_UNIX; } } if ((TempChar == WEOF) && ferror(ipInF)) { @@ -2160,7 +2187,7 @@ void FileInfoW(FILE* ipInF, CFlag *ipFlag, const char *filename, int bomtype, co return; } - printInfo(ipFlag, filename, bomtype, lb_dos, lb_unix, lb_mac); + printInfo(ipFlag, filename, bomtype, lb_dos, lb_unix, lb_mac, last_eol); } #endif @@ -2172,6 +2199,7 @@ void FileInfo(FILE* ipInF, CFlag *ipFlag, const char *filename, int bomtype, con unsigned int lb_dos = 0; unsigned int lb_unix = 0; unsigned int lb_mac = 0; + int last_eol = 0; ipFlag->status = 0; @@ -2185,18 +2213,24 @@ void FileInfo(FILE* ipInF, CFlag *ipFlag, const char *filename, int bomtype, con } if (TempChar != '\x0a') { /* Not an LF */ PreviousChar = TempChar; - if (TempChar == '\x0d') /* CR */ + if (TempChar == '\x0d') { /* CR */ lb_mac++; + last_eol = INFO_MAC; + } else { + last_eol = 0; + } } else { /* TempChar is an LF */ if ( PreviousChar == '\x0d' ) { /* CR,LF pair. */ lb_dos++; lb_mac--; + last_eol = INFO_DOS; PreviousChar = TempChar; continue; } PreviousChar = TempChar; lb_unix++; /* Unix line end (LF). */ + last_eol = INFO_UNIX; } } if ((TempChar == EOF) && ferror(ipInF)) { @@ -2210,7 +2244,7 @@ void FileInfo(FILE* ipInF, CFlag *ipFlag, const char *filename, int bomtype, con return; } - printInfo(ipFlag, filename, bomtype, lb_dos, lb_unix, lb_mac); + printInfo(ipFlag, filename, bomtype, lb_dos, lb_unix, lb_mac, last_eol); } int GetFileInfo(char *ipInFN, CFlag *ipFlag, const char *progname) @@ -2346,6 +2380,10 @@ void get_info_options(char *option, CFlag *pFlag, const char *progname) pFlag->file_info |= INFO_TEXT; default_info = 0; break; + case 'e': /* Print EOL of last line. */ + pFlag->file_info |= INFO_EOL; + default_info = 0; + break; case 'c': /* Print only files that would be converted. */ pFlag->file_info |= INFO_CONVERT; default_info = 0; diff --git a/dos2unix/common.h b/dos2unix/common.h index c8b01f5..1c31829 100644 --- a/dos2unix/common.h +++ b/dos2unix/common.h @@ -204,6 +204,7 @@ #define INFO_HEADER 0x40 #define INFO_NOPATH 0x80 #define INFO_PRINT0 0x100 +#define INFO_EOL 0x200 #define SYMLINK_SKIP 0 #define SYMLINK_FOLLOW 1 diff --git a/dos2unix/dos2unix.c b/dos2unix/dos2unix.c index 9ebb445..bb702e0 100644 --- a/dos2unix/dos2unix.c +++ b/dos2unix/dos2unix.c @@ -7,7 +7,7 @@ * See also https://www.freebsd.org/copyright/freebsd-license.html * -------- * - * Copyright (C) 2009-2023 Erwin Waterlander + * Copyright (C) 2009-2024 Erwin Waterlander * Copyright (C) 1998 Christian Wurll * Copyright (C) 1998 Bernd Johannes Wuebben * Copyright (C) 1994-1995 Benjamin Lin. @@ -81,7 +81,7 @@ Copyright (C) 2009-%d Erwin Waterlander\n\ Copyright (C) 1998 Christian Wurll (Version 3.1)\n\ Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n\ Copyright (C) 1994-1995 Benjamin Lin\n\ -All rights reserved.\n\n"),2023); +All rights reserved.\n\n"),2024); PrintBSDLicense(); } diff --git a/dos2unix/dos2unix.xcodeproj/xcshareddata/xcschemes/dos2unix.xcscheme b/dos2unix/dos2unix.xcodeproj/xcshareddata/xcschemes/dos2unix.xcscheme index b6eae00..65eda9b 100644 --- a/dos2unix/dos2unix.xcodeproj/xcshareddata/xcschemes/dos2unix.xcscheme +++ b/dos2unix/dos2unix.xcodeproj/xcshareddata/xcschemes/dos2unix.xcscheme @@ -1,6 +1,6 @@ output.txt +\& dos2unix \-e \-O Datei1.txt Datei2.txt > Ausgabe.txt .Ve -.IP "\fB\-o, \-\-oldfile \s-1FILE ...\s0\fR" 4 -.IX Item "-o, --oldfile FILE ..." +.IP "\fB\-o, \-\-oldfile \s-1DATEI\s0 …\fR" 4 +.IX Item "-o, --oldfile DATEI …" Alte-Datei-Modus. Die \s-1DATEI\s0 wird umgewandelt und durch die Ausgabedatei überschrieben. Per Vorgabe werden Umwandlungen in diesem Modus ausgeführt. Platzhalter sind verwendbar. .Sp Im Alte-Datei-Modus (Ersetzungsmodus) erhalten die umgewandelten Dateien den gleichen Eigentümer, die gleiche Gruppe und die gleichen Lese\- und Schreibberechtigungen wie die Originaldatei, auch wenn die Datei von einem anderen Benutzer umgewandelt wird, der Schreibrechte für die Datei hat (zum Beispiel der Systemadministrator). Die Umwandlung wird abgebrochen, wenn es nicht möglich ist, die originalen Werte beizubehalten. Die Änderung des Eigentümers könnte zum Beispiel bewirken, dass der ursprüngliche Eigentümer die Datei nicht mehr lesen kann. Die Änderung der Gruppe könnte ein Sicherheitsrisiko sein, da die Datei vielleicht für Benutzer lesbar wird, für die sie nicht bestimmt ist. Die Beibehaltung von Eigentümer, Gruppe und Schreib\- und Leserechten wird nur unter Unix unterstützt. @@ -410,7 +432,7 @@ erhält symbolische Links als solche und lässt die Ziele unverändert (Vorgabe) zeigt Versionsinformationen an und beendet das Programm. .SH "MAC-MODUS" .IX Header "MAC-MODUS" -Im Normalmodus werden Zeilenumbrüche von \s-1DOS\s0 nach Unix und umgekehrt umgewandelt. Mac\-Zeilenumbrüche werden nicht verändert. +In der Voreinstellung werden Zeilenumbrüche von \s-1DOS\s0 nach Unix und umgekehrt umgewandelt. Mac\-Zeilenumbrüche werden nicht verändert. .PP Im Mac-Modus werden Zeilenumbrüche von Mac nach Unix und umgekehrt umgewandelt. DOS\-Zeilenumbrüche werden nicht verändert. .PP @@ -419,9 +441,9 @@ Um das Programm im Mac-Modus auszuführen, verwenden Sie die Befehlszeilenoption .IX Header "UMWANDLUNGSMODI" .IP "\fBascii\fR" 4 .IX Item "ascii" -Im \f(CW\*(C`ascii\*(C'\fR\-Modus werden nur Zeilenumbrüche umgewandelt. Dies ist der vorgegebene Umwandlungsmodus. +Dies ist der vorgegebene Umwandlungsmodus. Dieser Modus dient zum Umwandeln von \s-1ASCII\-\s0 und ASCII-kompatibel kodierten Dateien, wie \s-1UTF\-8.\s0 Durch Aktivierung des \fBascii\fR\-Modus werden die Modi \fB7bit\fR und \fBiso\fR deaktiviert. .Sp -Obwohl der Name dieses Modus auf \s-1ASCII\s0 hinweist, welches ein 7\-bit\-Standard ist, bezieht sich der eigentliche Modus auf 8 Bit. Verwenden Sie diesen Modus immer dann, wenn Sie Unicode-Dateien in UTF\-8\-Kodierung umwandeln. +Falls dos2unix über Unterstützung für \s-1UTF\-16\s0 verfügt, werden UTF\-16\-kodierte Dateien auf POSIX-Systemen in die aktuelle Zeichenkodierung der Locale und unter Windows in \s-1UTF\-8\s0 umgewandelt. Die Aktivierung des \fBascii\fR\-Modus deaktiviert die Option \f(CW\*(C`\-u\*(C'\fR zum Erhalten der UTF\-16\-Kodierung sowie die Optionen \f(CW\*(C`\-ul\*(C'\fR und \f(CW\*(C`\-ub\*(C'\fR, welche davon ausgehen, dass die Eingabe in \s-1UTF\-16\s0 kodiert ist. Geben Sie den Befehl \f(CW\*(C`dos2unix \-V\*(C'\fR ein, um zu sehen, ob dos2unix \s-1UTF\-16\s0 unterstützt. Weitere Informationen hierzu finden Sie im Abschnitt \s-1UNICODE.\s0 .IP "\fB7bit\fR" 4 .IX Item "7bit" In diesem Modus werden alle Nicht-ASCII-Zeichen aus 8 Bit in das 7\-Bit\-Bitmuster umgewandelt. @@ -491,7 +513,7 @@ Siehe auch und . +Unicode-Textdateien unter Windows haben typischerweise eine Markierung der Bytereihenfolge (\s-1BOM\s0), da viele Windows-Programme (zum Beispiel Notepad) solche BOMs standardmäßig hinzufügen. Weitere Informationen hierzu finden Sie auf . .PP Unter Unix haben Textdateien üblicherweise keine \s-1BOM.\s0 Es wird stattdessen angenommen, dass Textdateien in der Zeichenkodierung entsprechend der Spracheinstellung vorliegen. .PP @@ -555,7 +577,7 @@ Umwandlung von Unix \s-1UTF\-8\s0 nach Windows \s-1UTF\-16:\s0 .Ve .SH "GB18030" .IX Header "GB18030" -\&\s-1GB18030\s0 ist ein Standard der chinesischen Regierung. Eine Teilmenge des in \s-1GB18030\s0 definierten Standards ist offiziell für alle in China verkauften Softwareprodukte vorgeschrieben. Siehe auch . +\&\s-1GB18030\s0 ist ein Standard der chinesischen Regierung. Eine Teilmenge des in \s-1GB18030\s0 definierten Standards ist offiziell für alle in China verkauften Softwareprodukte vorgeschrieben. Siehe auch . .PP \&\s-1GB18030\s0 ist vollständig zu Unicode kompatibel und kann als Unicode-Umwandlungsformat betrachtet werden. Wie auch \s-1UTF\-8\s0 ist \s-1GB18030\s0 kompatibel zu \s-1ASCII.\s0 Ebenfalls kompatibel ist es zur Codepage 936 von Windows, auch als \s-1GBK\s0 bekannt. .PP @@ -680,7 +702,7 @@ Die primäre Sprache wird durch die Umgebungsvariable \s-1LANG\s0 festgelegt. Di \& export LANG=en_GB.UTF\-8 Englisch, GB, UTF\-8\-Zeichenkodierung .Ve .Sp -Eine vollständige Liste der Sprachen und Ländercodes finden Sie im Gettext-Handbuch: +Eine vollständige Liste der Sprachen und Ländercodes finden Sie im Gettext-Handbuch: .Sp Auf Unix-Systemen erhalten Sie mit dem Befehl \fBlocale\fR\|(1) spezifische Informationen zu den Spracheinstellungen. .IP "\fB\s-1LANGUAGE\s0\fR" 4 diff --git a/dos2unix/man/de/man1/dos2unix.htm b/dos2unix/man/de/man1/dos2unix.htm index a7fb9b0..9768ebc 100644 --- a/dos2unix/man/de/man1/dos2unix.htm +++ b/dos2unix/man/de/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.5.1 - Formatumwandlung für Textdateien von DOS/Mac nach Unix und umgekehrt +dos2unix 7.5.2 - Formatumwandlung für Textdateien von DOS/Mac nach Unix und umgekehrt @@ -89,7 +89,7 @@

OPTIONEN

-ascii
-

wandelt nur Zeilenumbrüche um. Dies ist der vorgegebene Umwandlungsmodus.

+

ist der voreingestellte Umwandlungsmodus. Weitere Informationen hierzu finden Sie im Abschnitt UMWANDLUNGSMODI.

-iso
@@ -203,9 +203,9 @@

OPTIONEN

-e, --add-eol
-

Add a line break to the last line if there isn't one. This works for every conversion.

+

fügt einen Zeilenumbruch nach der letzten Zeile hinzu, falls ein solcher nicht existiert. Dies funktioniert in jeder Umwandlung.

-

A file converted from DOS to Unix format may lack a line break on the last line. There are text editors that write text files without a line break on the last line. Some Unix programs have problems processing these files, because the POSIX standard defines that every line in a text file must end with a terminating newline character. For instance concatenating files may not give the expected result.

+

Einer Datei, die aus dem DOS- ins Unix-Format umgewandelt wurde, kann ein Zeilenumbruch nach der letzten Zeile fehlen. Es gibt Texteditoren, die Dateien ohne diesen angehängten Zeilenumbruch schreiben. Einige Unix-Programme haben jedoch Probleme mit der Verarbeitung dieser Dateien, da der POSIX-Standard definiert, dass jede Zeile in einer Textdatei mit einem abschließenden Zeilenvorschubzeichen enden muss. Beispielsweise kann es beim Aneinanderhängen von solche Dateien zu unerwarteten Ergebnissen kommen.

-f, --force
@@ -246,6 +246,15 @@

OPTIONEN

Beachten sie, dass manchmal eine Binärdatei fälschlicherweise als Textdatei erkannt wird. Siehe auch Option -s.

+

Wenn zusätzlich die Option -e oder --add-eol verwendet wird, dann wird auch der Typ des Zeilenumbruchs der letzten Zeile ausgegeben, oder noeol, falls kein solcher Zeilenumbruch existiert.

+ +

Beispielausgabe:

+ +
6       0       0  no_bom    text   dos     dos.txt
+0       6       0  no_bom    text   unix    unix.txt
+0       0       6  no_bom    text   mac     mac.txt
+1       0       0  no_bom    text   noeol   noeol_dos.txt
+

Optionale zusätzliche Schalter können gesetzt werden, um die Ausgabe anzupassen. Einer oder mehrere Schalter können hinzugefügt werden.

@@ -285,6 +294,12 @@

OPTIONEN

zeigt an, ob es sich um eine Text- oder eine Binärdatei handelt.

+ +
e
+
+ +

gibt den Typ des Zeilenumbruchs der letzten Zeile aus, oder noeol, falls kein solcher Zeilenumbruch existiert.

+
c
@@ -293,6 +308,8 @@

OPTIONEN

Mit dem Schalter c gibt dos2unix nur die Dateien aus, die DOS-Zeilenumbrüche enthalten, unix2dos nur die Dateien mit Unix-Zeilenumbrüchen.

+

Wenn zusätzlich die Option -e oder --add-eol verwendet wird, dann werden auch die Dateien ausgegeben, denen der Zeilenumbruch an der letzten Zeile fehlt.

+
h
@@ -330,6 +347,10 @@

OPTIONEN

unix2dos -ic *.txt
+

Die Dateien auflisten, die DOS-Zeilenumbrüche enthalten oder bei denen der Zeilenumbruch nach der letzten Zeile fehlt:

+ +
dos2unix -e -ic *.txt
+

Nur Dateien umwandeln, die DOS-Zeilenumbrüche enthalten und die anderen Dateien unverändert belassen:

dos2unix -ic0 *.txt | xargs -0 dos2unix
@@ -390,20 +411,20 @@

OPTIONEN

--no-add-eol
-

Do not add a line break to the last line if there isn't one.

+

fügt keinen Zeilenumbruch nach der letzten Zeile hinzu, falls ein solcher nicht existiert.

-O, --to-stdout
-

Write to standard output, like a Unix filter. Use option -o to go back to old file (in-place) mode.

+

schreibt wie ein Unix-Filter in die Standardausgabe. Mit der Option -o können Sie zum Alte-Datei-Modus (Ersetzungsmodus) zurückkehren.

-

Combined with option -e files can be properly concatenated. No merged last and first lines, and no Unicode byte order marks in the middle of the concatenated file. Example:

+

In Kombination mit der Option -e können Dateien korrekt aneinandergehängt werden. Weder werden Zeilen ohne Umbruch zusammengeführt, noch werden Unicode-Markierungen der Bytereihenfolge mitten in die verkettete Datei gesetzt. Beispiel:

-
dos2unix -e -O file1.txt file2.txt > output.txt
+
dos2unix -e -O Datei1.txt Datei2.txt > Ausgabe.txt
-
-o, --oldfile FILE ...
+
-o, --oldfile DATEI …

Alte-Datei-Modus. Die DATEI wird umgewandelt und durch die Ausgabedatei überschrieben. Per Vorgabe werden Umwandlungen in diesem Modus ausgeführt. Platzhalter sind verwendbar.

@@ -503,7 +524,7 @@

OPTIONEN

MAC-MODUS

-

Im Normalmodus werden Zeilenumbrüche von DOS nach Unix und umgekehrt umgewandelt. Mac-Zeilenumbrüche werden nicht verändert.

+

In der Voreinstellung werden Zeilenumbrüche von DOS nach Unix und umgekehrt umgewandelt. Mac-Zeilenumbrüche werden nicht verändert.

Im Mac-Modus werden Zeilenumbrüche von Mac nach Unix und umgekehrt umgewandelt. DOS-Zeilenumbrüche werden nicht verändert.

@@ -516,9 +537,9 @@

UMWANDLUNGSMODI

ascii
-

Im ascii-Modus werden nur Zeilenumbrüche umgewandelt. Dies ist der vorgegebene Umwandlungsmodus.

+

Dies ist der vorgegebene Umwandlungsmodus. Dieser Modus dient zum Umwandeln von ASCII- und ASCII-kompatibel kodierten Dateien, wie UTF-8. Durch Aktivierung des ascii-Modus werden die Modi 7bit und iso deaktiviert.

-

Obwohl der Name dieses Modus auf ASCII hinweist, welches ein 7-bit-Standard ist, bezieht sich der eigentliche Modus auf 8 Bit. Verwenden Sie diesen Modus immer dann, wenn Sie Unicode-Dateien in UTF-8-Kodierung umwandeln.

+

Falls dos2unix über Unterstützung für UTF-16 verfügt, werden UTF-16-kodierte Dateien auf POSIX-Systemen in die aktuelle Zeichenkodierung der Locale und unter Windows in UTF-8 umgewandelt. Die Aktivierung des ascii-Modus deaktiviert die Option -u zum Erhalten der UTF-16-Kodierung sowie die Optionen -ul und -ub, welche davon ausgehen, dass die Eingabe in UTF-16 kodiert ist. Geben Sie den Befehl dos2unix -V ein, um zu sehen, ob dos2unix UTF-16 unterstützt. Weitere Informationen hierzu finden Sie im Abschnitt UNICODE.

7bit
@@ -583,7 +604,7 @@

Zeichenkodierungen

Umwandlung

-

Unicode-Textdateien können DOS-, Unix- oder Mac-Zeilenumbrüche enthalten, so wie reguläre Textdateien.

+

Unicode-Textdateien können DOS-, Unix- oder Mac-Zeilenumbrüche enthalten, so wie ASCII-Textdateien.

Alle Versionen von dos2unix und unix2dos können UTF-8-kodierte Dateien umwandeln, weil UTF-8 im Hinblick auf Abwärtskompatibilität mit ASCII entwickelt wurde.

@@ -603,7 +624,7 @@

Umwandlung

Markierung der Bytereihenfolge

-

Unicode-Textdateien unter Windows haben typischerweise eine Markierung der Bytereihenfolge (BOM), da viele Windows-Programme (zum Beispiel Notepad) solche BOMs standardmäßig hinzufügen. Weitere Informationen hierzu finden Sie auf http://de.wikipedia.org/wiki/Byte-Reihenfolge.

+

Unicode-Textdateien unter Windows haben typischerweise eine Markierung der Bytereihenfolge (BOM), da viele Windows-Programme (zum Beispiel Notepad) solche BOMs standardmäßig hinzufügen. Weitere Informationen hierzu finden Sie auf https://de.wikipedia.org/wiki/Byte-Reihenfolge.

Unter Unix haben Textdateien üblicherweise keine BOM. Es wird stattdessen angenommen, dass Textdateien in der Zeichenkodierung entsprechend der Spracheinstellung vorliegen.

@@ -643,7 +664,7 @@

Unicode-Beispiele

GB18030

-

GB18030 ist ein Standard der chinesischen Regierung. Eine Teilmenge des in GB18030 definierten Standards ist offiziell für alle in China verkauften Softwareprodukte vorgeschrieben. Siehe auch http://de.wikipedia.org/wiki/GB_18030.

+

GB18030 ist ein Standard der chinesischen Regierung. Eine Teilmenge des in GB18030 definierten Standards ist offiziell für alle in China verkauften Softwareprodukte vorgeschrieben. Siehe auch https://de.wikipedia.org/wiki/GB_18030.

GB18030 ist vollständig zu Unicode kompatibel und kann als Unicode-Umwandlungsformat betrachtet werden. Wie auch UTF-8 ist GB18030 kompatibel zu ASCII. Ebenfalls kompatibel ist es zur Codepage 936 von Windows, auch als GBK bekannt.

@@ -742,7 +763,7 @@

LOKALISIERUNG

export LANG=en_US.iso88591 Englisch, USA, Latin-1-Zeichenkodierung export LANG=en_GB.UTF-8 Englisch, GB, UTF-8-Zeichenkodierung -

Eine vollständige Liste der Sprachen und Ländercodes finden Sie im Gettext-Handbuch: http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

+

Eine vollständige Liste der Sprachen und Ländercodes finden Sie im Gettext-Handbuch: https://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

Auf Unix-Systemen erhalten Sie mit dem Befehl locale(1) spezifische Informationen zu den Spracheinstellungen.

diff --git a/dos2unix/man/de/man1/dos2unix.pod b/dos2unix/man/de/man1/dos2unix.pod index d9c70c3..21bf8ec 100644 --- a/dos2unix/man/de/man1/dos2unix.pod +++ b/dos2unix/man/de/man1/dos2unix.pod @@ -63,7 +63,7 @@ Wenn diese Option verwendet wird, dann bricht die Umwandlung nicht ab, wenn der =item B<-ascii> -wandelt nur Zeilenumbrüche um. Dies ist der vorgegebene Umwandlungsmodus. +ist der voreingestellte Umwandlungsmodus. Weitere Informationen hierzu finden Sie im Abschnitt UMWANDLUNGSMODI. =item B<-iso> @@ -153,9 +153,9 @@ Die Standardkodierung kann durch Setzen der Umgebungsvariable DOS2UNIX_DISPLAY_E =item B<-e, --add-eol> -Add a line break to the last line if there isn't one. This works for every conversion. +fügt einen Zeilenumbruch nach der letzten Zeile hinzu, falls ein solcher nicht existiert. Dies funktioniert in jeder Umwandlung. -A file converted from DOS to Unix format may lack a line break on the last line. There are text editors that write text files without a line break on the last line. Some Unix programs have problems processing these files, because the POSIX standard defines that every line in a text file must end with a terminating newline character. For instance concatenating files may not give the expected result. +Einer Datei, die aus dem DOS- ins Unix-Format umgewandelt wurde, kann ein Zeilenumbruch nach der letzten Zeile fehlen. Es gibt Texteditoren, die Dateien ohne diesen angehängten Zeilenumbruch schreiben. Einige Unix-Programme haben jedoch Probleme mit der Verarbeitung dieser Dateien, da der POSIX-Standard definiert, dass jede Zeile in einer Textdatei mit einem abschließenden Zeilenvorschubzeichen enden muss. Beispielsweise kann es beim Aneinanderhängen von solche Dateien zu unerwarteten Ergebnissen kommen. =item B<-f, --force> @@ -188,6 +188,15 @@ Beispielausgabe: Beachten sie, dass manchmal eine Binärdatei fälschlicherweise als Textdatei erkannt wird. Siehe auch Option C<-s>. +Wenn zusätzlich die Option C<-e> oder C<--add-eol> verwendet wird, dann wird auch der Typ des Zeilenumbruchs der letzten Zeile ausgegeben, oder C, falls kein solcher Zeilenumbruch existiert. + +Beispielausgabe: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Optionale zusätzliche Schalter können gesetzt werden, um die Ausgabe anzupassen. Einer oder mehrere Schalter können hinzugefügt werden. =over 4 @@ -216,12 +225,18 @@ gibt die Markierung der Bytereihenfolge aus. zeigt an, ob es sich um eine Text- oder eine Binärdatei handelt. +=item B + +gibt den Typ des Zeilenumbruchs der letzten Zeile aus, oder C, falls kein solcher Zeilenumbruch existiert. + =item B gibt nur die Dateien aus, die umgewandelt werden würden. Mit dem Schalter C gibt dos2unix nur die Dateien aus, die DOS-Zeilenumbrüche enthalten, unix2dos nur die Dateien mit Unix-Zeilenumbrüchen. +Wenn zusätzlich die Option C<-e> oder C<--add-eol> verwendet wird, dann werden auch die Dateien ausgegeben, denen der Zeilenumbruch an der letzten Zeile fehlt. + =item B gibt eine Kopfzeile aus. @@ -254,6 +269,10 @@ Die Dateien auflisten, die Unix-Zeilenumbrüche enthalten: unix2dos -ic *.txt +Die Dateien auflisten, die DOS-Zeilenumbrüche enthalten oder bei denen der Zeilenumbruch nach der letzten Zeile fehlt: + + dos2unix -e -ic *.txt + Nur Dateien umwandeln, die DOS-Zeilenumbrüche enthalten und die anderen Dateien unverändert belassen: dos2unix -ic0 *.txt | xargs -0 dos2unix @@ -302,17 +321,17 @@ bricht die Umwandlung ab, wenn der Eigentümer und/oder die Gruppe der Originald =item B<--no-add-eol> -Do not add a line break to the last line if there isn't one. +fügt keinen Zeilenumbruch nach der letzten Zeile hinzu, falls ein solcher nicht existiert. =item B<-O, --to-stdout> -Write to standard output, like a Unix filter. Use option C<-o> to go back to old file (in-place) mode. +schreibt wie ein Unix-Filter in die Standardausgabe. Mit der Option C<-o> können Sie zum Alte-Datei-Modus (Ersetzungsmodus) zurückkehren. -Combined with option C<-e> files can be properly concatenated. No merged last and first lines, and no Unicode byte order marks in the middle of the concatenated file. Example: +In Kombination mit der Option C<-e> können Dateien korrekt aneinandergehängt werden. Weder werden Zeilen ohne Umbruch zusammengeführt, noch werden Unicode-Markierungen der Bytereihenfolge mitten in die verkettete Datei gesetzt. Beispiel: - dos2unix -e -O file1.txt file2.txt > output.txt + dos2unix -e -O Datei1.txt Datei2.txt > Ausgabe.txt -=item B<-o, --oldfile FILE ...> +=item B<-o, --oldfile DATEI …> Alte-Datei-Modus. Die DATEI wird umgewandelt und durch die Ausgabedatei überschrieben. Per Vorgabe werden Umwandlungen in diesem Modus ausgeführt. Platzhalter sind verwendbar. @@ -388,7 +407,7 @@ zeigt Versionsinformationen an und beendet das Programm. =head1 MAC-MODUS -Im Normalmodus werden Zeilenumbrüche von DOS nach Unix und umgekehrt umgewandelt. Mac-Zeilenumbrüche werden nicht verändert. +In der Voreinstellung werden Zeilenumbrüche von DOS nach Unix und umgekehrt umgewandelt. Mac-Zeilenumbrüche werden nicht verändert. Im Mac-Modus werden Zeilenumbrüche von Mac nach Unix und umgekehrt umgewandelt. DOS-Zeilenumbrüche werden nicht verändert. @@ -400,9 +419,9 @@ Um das Programm im Mac-Modus auszuführen, verwenden Sie die Befehlszeilenoption =item B -Im C-Modus werden nur Zeilenumbrüche umgewandelt. Dies ist der vorgegebene Umwandlungsmodus. +Dies ist der vorgegebene Umwandlungsmodus. Dieser Modus dient zum Umwandeln von ASCII- und ASCII-kompatibel kodierten Dateien, wie UTF-8. Durch Aktivierung des B-Modus werden die Modi B<7bit> und B deaktiviert. -Obwohl der Name dieses Modus auf ASCII hinweist, welches ein 7-bit-Standard ist, bezieht sich der eigentliche Modus auf 8 Bit. Verwenden Sie diesen Modus immer dann, wenn Sie Unicode-Dateien in UTF-8-Kodierung umwandeln. +Falls dos2unix über Unterstützung für UTF-16 verfügt, werden UTF-16-kodierte Dateien auf POSIX-Systemen in die aktuelle Zeichenkodierung der Locale und unter Windows in UTF-8 umgewandelt. Die Aktivierung des B-Modus deaktiviert die Option C<-u> zum Erhalten der UTF-16-Kodierung sowie die Optionen C<-ul> und C<-ub>, welche davon ausgehen, dass die Eingabe in UTF-16 kodiert ist. Geben Sie den Befehl C ein, um zu sehen, ob dos2unix UTF-16 unterstützt. Weitere Informationen hierzu finden Sie im Abschnitt UNICODE. =item B<7bit> @@ -462,7 +481,7 @@ Es gibt verschiedene Unicode-Zeichenkodierungen. Unter Unix und Linux sind Unico =head2 Umwandlung -Unicode-Textdateien können DOS-, Unix- oder Mac-Zeilenumbrüche enthalten, so wie reguläre Textdateien. +Unicode-Textdateien können DOS-, Unix- oder Mac-Zeilenumbrüche enthalten, so wie ASCII-Textdateien. Alle Versionen von dos2unix und unix2dos können UTF-8-kodierte Dateien umwandeln, weil UTF-8 im Hinblick auf Abwärtskompatibilität mit ASCII entwickelt wurde. @@ -482,7 +501,7 @@ Umwandlungen im ISO- und 7bit-Modus funktionieren mit UTF-16-Dateien nicht. =head2 Markierung der Bytereihenfolge -Unicode-Textdateien unter Windows haben typischerweise eine Markierung der Bytereihenfolge (BOM), da viele Windows-Programme (zum Beispiel Notepad) solche BOMs standardmäßig hinzufügen. Weitere Informationen hierzu finden Sie auf L. +Unicode-Textdateien unter Windows haben typischerweise eine Markierung der Bytereihenfolge (BOM), da viele Windows-Programme (zum Beispiel Notepad) solche BOMs standardmäßig hinzufügen. Weitere Informationen hierzu finden Sie auf L. Unter Unix haben Textdateien üblicherweise keine BOM. Es wird stattdessen angenommen, dass Textdateien in der Zeichenkodierung entsprechend der Spracheinstellung vorliegen. @@ -522,7 +541,7 @@ Umwandlung von Unix UTF-8 nach Windows UTF-16: =head1 GB18030 -GB18030 ist ein Standard der chinesischen Regierung. Eine Teilmenge des in GB18030 definierten Standards ist offiziell für alle in China verkauften Softwareprodukte vorgeschrieben. Siehe auch L. +GB18030 ist ein Standard der chinesischen Regierung. Eine Teilmenge des in GB18030 definierten Standards ist offiziell für alle in China verkauften Softwareprodukte vorgeschrieben. Siehe auch L. GB18030 ist vollständig zu Unicode kompatibel und kann als Unicode-Umwandlungsformat betrachtet werden. Wie auch UTF-8 ist GB18030 kompatibel zu ASCII. Ebenfalls kompatibel ist es zur Codepage 936 von Windows, auch als GBK bekannt. @@ -622,7 +641,7 @@ Die primäre Sprache wird durch die Umgebungsvariable LANG festgelegt. Diese Var export LANG=en_US.iso88591 Englisch, USA, Latin-1-Zeichenkodierung export LANG=en_GB.UTF-8 Englisch, GB, UTF-8-Zeichenkodierung -Eine vollständige Liste der Sprachen und Ländercodes finden Sie im Gettext-Handbuch: L +Eine vollständige Liste der Sprachen und Ländercodes finden Sie im Gettext-Handbuch: L Auf Unix-Systemen erhalten Sie mit dem Befehl locale(1) spezifische Informationen zu den Spracheinstellungen. diff --git a/dos2unix/man/de/man1/dos2unix.txt b/dos2unix/man/de/man1/dos2unix.txt index a7a4eee..0c69097 100644 --- a/dos2unix/man/de/man1/dos2unix.txt +++ b/dos2unix/man/de/man1/dos2unix.txt @@ -70,8 +70,8 @@ OPTIONEN Eigentümers und der Gruppe von Dateien verfügt. -ascii - wandelt nur Zeilenumbrüche um. Dies ist der vorgegebene - Umwandlungsmodus. + ist der voreingestellte Umwandlungsmodus. Weitere Informationen + hierzu finden Sie im Abschnitt UMWANDLUNGSMODI. -iso wandelt aus dem DOS- in den ISO-8859-1-Zeichensatz um. Weitere @@ -186,16 +186,18 @@ OPTIONEN geändert werden. -e, --add-eol - Add a line break to the last line if there isn't one. This works for - every conversion. - - A file converted from DOS to Unix format may lack a line break on - the last line. There are text editors that write text files without - a line break on the last line. Some Unix programs have problems - processing these files, because the POSIX standard defines that - every line in a text file must end with a terminating newline - character. For instance concatenating files may not give the - expected result. + fügt einen Zeilenumbruch nach der letzten Zeile hinzu, falls ein + solcher nicht existiert. Dies funktioniert in jeder Umwandlung. + + Einer Datei, die aus dem DOS- ins Unix-Format umgewandelt wurde, + kann ein Zeilenumbruch nach der letzten Zeile fehlen. Es gibt + Texteditoren, die Dateien ohne diesen angehängten Zeilenumbruch + schreiben. Einige Unix-Programme haben jedoch Probleme mit der + Verarbeitung dieser Dateien, da der POSIX-Standard definiert, dass + jede Zeile in einer Textdatei mit einem abschließenden + Zeilenvorschubzeichen enden muss. Beispielsweise kann es beim + Aneinanderhängen von solche Dateien zu unerwarteten Ergebnissen + kommen. -f, --force erzwingt die Umwandlung von Binärdateien. @@ -231,6 +233,18 @@ OPTIONEN Beachten sie, dass manchmal eine Binärdatei fälschlicherweise als Textdatei erkannt wird. Siehe auch Option "-s". + Wenn zusätzlich die Option "-e" oder "--add-eol" verwendet wird, + dann wird auch der Typ des Zeilenumbruchs der letzten Zeile + ausgegeben, oder "noeol", falls kein solcher Zeilenumbruch + existiert. + + Beispielausgabe: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Optionale zusätzliche Schalter können gesetzt werden, um die Ausgabe anzupassen. Einer oder mehrere Schalter können hinzugefügt werden. @@ -251,12 +265,19 @@ OPTIONEN t zeigt an, ob es sich um eine Text- oder eine Binärdatei handelt. + e gibt den Typ des Zeilenumbruchs der letzten Zeile aus, oder + "noeol", falls kein solcher Zeilenumbruch existiert. + c gibt nur die Dateien aus, die umgewandelt werden würden. Mit dem Schalter "c" gibt dos2unix nur die Dateien aus, die DOS-Zeilenumbrüche enthalten, unix2dos nur die Dateien mit Unix-Zeilenumbrüchen. + Wenn zusätzlich die Option "-e" oder "--add-eol" verwendet wird, + dann werden auch die Dateien ausgegeben, denen der Zeilenumbruch + an der letzten Zeile fehlt. + h gibt eine Kopfzeile aus. p zeigt Dateinamen ohne Pfade an. @@ -284,6 +305,11 @@ OPTIONEN unix2dos -ic *.txt + Die Dateien auflisten, die DOS-Zeilenumbrüche enthalten oder bei + denen der Zeilenumbruch nach der letzten Zeile fehlt: + + dos2unix -e -ic *.txt + Nur Dateien umwandeln, die DOS-Zeilenumbrüche enthalten und die anderen Dateien unverändert belassen: @@ -343,19 +369,21 @@ OPTIONEN Eigentümers und der Gruppe von Dateien verfügt. --no-add-eol - Do not add a line break to the last line if there isn't one. + fügt keinen Zeilenumbruch nach der letzten Zeile hinzu, falls ein + solcher nicht existiert. -O, --to-stdout - Write to standard output, like a Unix filter. Use option "-o" to go - back to old file (in-place) mode. + schreibt wie ein Unix-Filter in die Standardausgabe. Mit der Option + "-o" können Sie zum Alte-Datei-Modus (Ersetzungsmodus) zurückkehren. - Combined with option "-e" files can be properly concatenated. No - merged last and first lines, and no Unicode byte order marks in the - middle of the concatenated file. Example: + In Kombination mit der Option "-e" können Dateien korrekt + aneinandergehängt werden. Weder werden Zeilen ohne Umbruch + zusammengeführt, noch werden Unicode-Markierungen der + Bytereihenfolge mitten in die verkettete Datei gesetzt. Beispiel: - dos2unix -e -O file1.txt file2.txt > output.txt + dos2unix -e -O Datei1.txt Datei2.txt > Ausgabe.txt - -o, --oldfile FILE ... + -o, --oldfile DATEI … Alte-Datei-Modus. Die DATEI wird umgewandelt und durch die Ausgabedatei überschrieben. Per Vorgabe werden Umwandlungen in diesem Modus ausgeführt. Platzhalter sind verwendbar. @@ -470,8 +498,8 @@ OPTIONEN zeigt Versionsinformationen an und beendet das Programm. MAC-MODUS - Im Normalmodus werden Zeilenumbrüche von DOS nach Unix und umgekehrt - umgewandelt. Mac-Zeilenumbrüche werden nicht verändert. + In der Voreinstellung werden Zeilenumbrüche von DOS nach Unix und + umgekehrt umgewandelt. Mac-Zeilenumbrüche werden nicht verändert. Im Mac-Modus werden Zeilenumbrüche von Mac nach Unix und umgekehrt umgewandelt. DOS-Zeilenumbrüche werden nicht verändert. @@ -482,13 +510,20 @@ MAC-MODUS UMWANDLUNGSMODI ascii - Im "ascii"-Modus werden nur Zeilenumbrüche umgewandelt. Dies ist der - vorgegebene Umwandlungsmodus. - - Obwohl der Name dieses Modus auf ASCII hinweist, welches ein - 7-bit-Standard ist, bezieht sich der eigentliche Modus auf 8 Bit. - Verwenden Sie diesen Modus immer dann, wenn Sie Unicode-Dateien in - UTF-8-Kodierung umwandeln. + Dies ist der vorgegebene Umwandlungsmodus. Dieser Modus dient zum + Umwandeln von ASCII- und ASCII-kompatibel kodierten Dateien, wie + UTF-8. Durch Aktivierung des ascii-Modus werden die Modi 7bit und + iso deaktiviert. + + Falls dos2unix über Unterstützung für UTF-16 verfügt, werden + UTF-16-kodierte Dateien auf POSIX-Systemen in die aktuelle + Zeichenkodierung der Locale und unter Windows in UTF-8 umgewandelt. + Die Aktivierung des ascii-Modus deaktiviert die Option "-u" zum + Erhalten der UTF-16-Kodierung sowie die Optionen "-ul" und "-ub", + welche davon ausgehen, dass die Eingabe in UTF-16 kodiert ist. Geben + Sie den Befehl "dos2unix -V" ein, um zu sehen, ob dos2unix UTF-16 + unterstützt. Weitere Informationen hierzu finden Sie im Abschnitt + UNICODE. 7bit In diesem Modus werden alle Nicht-ASCII-Zeichen aus 8 Bit in das @@ -559,7 +594,7 @@ UNICODE Umwandlung Unicode-Textdateien können DOS-, Unix- oder Mac-Zeilenumbrüche - enthalten, so wie reguläre Textdateien. + enthalten, so wie ASCII-Textdateien. Alle Versionen von dos2unix und unix2dos können UTF-8-kodierte Dateien umwandeln, weil UTF-8 im Hinblick auf Abwärtskompatibilität mit ASCII @@ -600,7 +635,7 @@ UNICODE Unicode-Textdateien unter Windows haben typischerweise eine Markierung der Bytereihenfolge (BOM), da viele Windows-Programme (zum Beispiel Notepad) solche BOMs standardmäßig hinzufügen. Weitere Informationen - hierzu finden Sie auf . + hierzu finden Sie auf . Unter Unix haben Textdateien üblicherweise keine BOM. Es wird stattdessen angenommen, dass Textdateien in der Zeichenkodierung @@ -658,7 +693,7 @@ GB18030 GB18030 ist ein Standard der chinesischen Regierung. Eine Teilmenge des in GB18030 definierten Standards ist offiziell für alle in China verkauften Softwareprodukte vorgeschrieben. Siehe auch - . + . GB18030 ist vollständig zu Unicode kompatibel und kann als Unicode-Umwandlungsformat betrachtet werden. Wie auch UTF-8 ist GB18030 @@ -781,8 +816,8 @@ LOKALISIERUNG Eine vollständige Liste der Sprachen und Ländercodes finden Sie im Gettext-Handbuch: - + Auf Unix-Systemen erhalten Sie mit dem Befehl locale(1) spezifische Informationen zu den Spracheinstellungen. diff --git a/dos2unix/man/es/man1/dos2unix.1 b/dos2unix/man/es/man1/dos2unix.1 index 0871d91..6449b27 100644 --- a/dos2unix/man/es/man1/dos2unix.1 +++ b/dos2unix/man/es/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2023-08-29" "dos2unix" "2023-08-29" +.TH dos2unix 1 "2024-01-22" "dos2unix" "2024-01-22" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -122,7 +122,7 @@ Allow file ownership change in old file mode. When this option is used, the conversion will not be aborted when the user and/or group ownership of the original file can't be preserved in old file mode. Conversion will continue and the converted file will get the same new ownership as if it was converted in new file mode. See also options \f(CW\*(C`\-o\*(C'\fR and \f(CW\*(C`\-n\*(C'\fR. This option is only available if dos2unix has support for preserving the user and group ownership of files. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" -Sólo convierte los salto de línea. Éste es el modo de conversión por defecto. +Default conversion mode. See also section \s-1CONVERSION MODES.\s0 .IP "\fB\-iso\fR" 4 .IX Item "-iso" Conversión entre el conjunto de caracteres \s-1DOS\s0 e \s-1ISO\-8859\-1.\s0 Véase también la sección \s-1MODOS DE\s0 CONVERSIÓN. @@ -224,6 +224,17 @@ Ejemplo de salida: .Sp Note that sometimes a binary file can be mistaken for a text file. See also option \f(CW\*(C`\-s\*(C'\fR. .Sp +If in addition option \f(CW\*(C`\-e\*(C'\fR or \f(CW\*(C`\-\-add\-eol\*(C'\fR is used also the type of the line break of the last line is printed, or \f(CW\*(C`noeol\*(C'\fR if there is none. +.Sp +Ejemplo de salida: +.Sp +.Vb 4 +\& 6 0 0 no_bom text dos dos.txt +\& 0 6 0 no_bom text unix unix.txt +\& 0 0 6 no_bom text mac mac.txt +\& 1 0 0 no_bom text noeol noeol_dos.txt +.Ve +.Sp Se pueden utilizar marcas extras opcionales para modificar la salida. Se pueden añadir una o más marcas. .RS 4 .IP "\fB0\fR" 4 @@ -244,11 +255,16 @@ Muestra la Marca de Orden de Byte. .IP "\fBt\fR" 4 .IX Item "t" Muestra si el archivo es de texto o binario. +.IP "\fBe\fR" 4 +.IX Item "e" +Print the type of the line break of the last line, or \f(CW\*(C`noeol\*(C'\fR if there is none. .IP "\fBc\fR" 4 .IX Item "c" Muestra sólo los archivos que pueden ser convertidos. .Sp Con la marca \f(CW\*(C`c\*(C'\fR dos2unix sólo mostrará los archivos que contengan saltos de línea \s-1DOS,\s0 unix2dos sólo mostrará los nombres de archivo que tengan saltos de línea Unix. +.Sp +If in addition option \f(CW\*(C`\-e\*(C'\fR or \f(CW\*(C`\-\-add\-eol\*(C'\fR is used also the files that lack a line break on the last line will be printed. .IP "\fBh\fR" 4 .IX Item "h" Print a header. @@ -290,6 +306,12 @@ Muestra los archivos que tienen saltos de línea Unix: \& unix2dos \-ic *.txt .Ve .Sp +List the files that have \s-1DOS\s0 line breaks or lack a line break on the last line: +.Sp +.Vb 1 +\& dos2unix \-e \-ic *.txt +.Ve +.Sp Convert only files that have \s-1DOS\s0 line breaks and leave the other files untouched: .Sp .Vb 1 @@ -410,7 +432,7 @@ No altera los enlaces simbólicos ni sus destinos (por defecto). Despiega la información de la versión y termina el programa. .SH "MODO MAC" .IX Header "MODO MAC" -En modo normal los saltos de línea son convertidos de \s-1DOS\s0 a Unix y viceversa. Los saltos de línea Mac no son convertidos. +By default line breaks are converted from \s-1DOS\s0 to Unix and vice versa. Mac line breaks are not converted. .PP En modo Mac los saltos de línea son convertidos de Mac a Unix y viceversa. Los saltos de línea \s-1DOS\s0 no son modificados. .PP @@ -419,9 +441,9 @@ Para ejecutar en modo Mac use el modificador \f(CW\*(C`\-c mac\*(C'\fR o use los .IX Header "MODOS DE CONVERSIÓN" .IP "\fBascii\fR" 4 .IX Item "ascii" -En modo \f(CW\*(C`ascii\*(C'\fR sólo los saltos de línea son convertidos. Éste es el modo de conversión por defecto. +This is the default conversion mode. This mode is for converting \s-1ASCII\s0 and ASCII-compatible encoded files, like \s-1UTF\-8.\s0 Enabling \fBascii\fR mode disables \fB7bit\fR and \fBiso\fR mode. .Sp -Aunque el nombre de este modo es \s-1ASCII,\s0 que es un estándar de 7 bits, éste emplea 8 bits. Siempre use este modo cuando convierta archivos Unicode \s-1UTF\-8.\s0 +If dos2unix has \s-1UTF\-16\s0 support, \s-1UTF\-16\s0 encoded files are converted to the current locale character encoding on \s-1POSIX\s0 systems and to \s-1UTF\-8\s0 on Windows. Enabling \fBascii\fR mode disables the option to keep \s-1UTF\-16\s0 encoding (\f(CW\*(C`\-u\*(C'\fR) and the options to assume \s-1UTF\-16\s0 input (\f(CW\*(C`\-ul\*(C'\fR and \f(CW\*(C`\-ub\*(C'\fR). To see if dos2unix has \s-1UTF\-16\s0 support type \f(CW\*(C`dos2unix \-V\*(C'\fR. See also section \s-1UNICODE.\s0 .IP "\fB7bit\fR" 4 .IX Item "7bit" En este modo todos los caracteres no \s-1ASCII\s0 de 8 bits (con valores de 128 a 255) son convertidos al espacio de 7 bits. @@ -491,7 +513,7 @@ Véase también y . +On Windows Unicode text files typically have a Byte Order Mark (\s-1BOM\s0), because many Windows programs (including Notepad) add BOMs by default. See also . .PP En Unix los archivos Unicode no suelen tener \s-1BOM.\s0 Se supone que los archivos de texto son codificados en la codificación local de caracteres. .PP @@ -555,7 +577,7 @@ Convertir de Unix \s-1UTF\-8\s0 a Windows \s-1UTF\-16:\s0 .Ve .SH "GB18030" .IX Header "GB18030" -\&\s-1GB18030\s0 es un estándar del gobierno chino. Todo producto software vendido en China está obligado por ley a contener un subconjunto del \s-1GB18030\s0 estándar. Véase . +\&\s-1GB18030\s0 is a Chinese government standard. A mandatory subset of the \s-1GB18030\s0 standard is officially required for all software products sold in China. See also . .PP \&\s-1GB18030\s0 es totalmente compatible con Unicode y puede considerarse como formato de transformación Unicode. Como ocurre con \s-1UTF\-8, GB18030\s0 es compatible con \s-1ASCII. GB18030\s0 también es compatible con la página de códigos de Windows 936, también conocida como \s-1GBK.\s0 .PP @@ -680,12 +702,12 @@ El idioma principal se selecciona con la variable de entorno \s-1LANG.\s0 La var \& export LANG=en_GB.UTF\-8 Ingles, Reino Unido, codificación UTF\-8 .Ve .Sp -Para obtener una lista completa de códigos de idioma y país véase el manual de gettext: +For a complete list of language and country codes see the gettext manual: .Sp En sistemas Unix puede emplear el comando \fBlocale\fR\|(1) para obtener información específica de locale. .IP "\fB\s-1LANGUAGE\s0\fR" 4 .IX Item "LANGUAGE" -Con la variable de entorno \s-1LANGUAGE\s0 puede especificar una lista de prioridad de los idiomas, separados por dos puntos. Dos2unix da preferencia a \s-1LANGUAGE\s0 sobre \s-1LANG.\s0 Por ejemplo, primero neerlandés y entonces alemán: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. Para usar una lista de prioridad de idiomas a través de la variable \s-1LANGUAGE\s0 tiene que habilitar antes la internacionalización, asignando un valor distinto de \*(L"C\*(R" a \s-1LANG\s0 (o \s-1LC_ALL\s0). Véase también el manual de gettext: +With the \s-1LANGUAGE\s0 environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to \s-1LANGUAGE\s0 over \s-1LANG.\s0 For instance, first Dutch and then German: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. You have to first enable localization, by setting \s-1LANG\s0 (or \s-1LC_ALL\s0) to a value other than \*(L"C\*(R", before you can use a language priority list through the \s-1LANGUAGE\s0 variable. See also the gettext manual: .Sp Si selecciona un idioma que no está disponible el programa funcionará en ingles. .IP "\fB\s-1DOS2UNIX_LOCALEDIR\s0\fR" 4 @@ -704,20 +726,20 @@ Se regresa cero cuando el programa termina exitosamente. Cuando ocurre un error El valor de retorno es siempre cero en modo silencioso, excepto cuando se emplean parámetros incorrectos. .SH "ESTÁNDARES" .IX Header "ESTÁNDARES" - + .PP - + .PP - + .PP - + .SH "AUTORES" .IX Header "AUTORES" Benjamin Lin \- , Bernd Johannes Wuebben (mac2unix mode) \- , Christian Wurll (add extra newline) \- , Erwin Waterlander \- (maintainer) .PP -Página del proyecto: +Project page: .PP -Página de SourceForge: +SourceForge page: .SH "VÉASE TAMBIÉN" .IX Header "VÉASE TAMBIÉN" \&\fBfile\fR\|(1) \fBfind\fR\|(1) \fBiconv\fR\|(1) \fBlocale\fR\|(1) \fBxargs\fR\|(1) diff --git a/dos2unix/man/es/man1/dos2unix.htm b/dos2unix/man/es/man1/dos2unix.htm index a6a8371..bb09369 100644 --- a/dos2unix/man/es/man1/dos2unix.htm +++ b/dos2unix/man/es/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.5.1 - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa +dos2unix 7.5.2 - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa @@ -89,7 +89,7 @@

PARÁMETROS

-ascii
-

Sólo convierte los salto de línea. Éste es el modo de conversión por defecto.

+

Default conversion mode. See also section CONVERSION MODES.

-iso
@@ -246,6 +246,15 @@

PARÁMETROS

Note that sometimes a binary file can be mistaken for a text file. See also option -s.

+

If in addition option -e or --add-eol is used also the type of the line break of the last line is printed, or noeol if there is none.

+ +

Ejemplo de salida:

+ +
6       0       0  no_bom    text   dos     dos.txt
+0       6       0  no_bom    text   unix    unix.txt
+0       0       6  no_bom    text   mac     mac.txt
+1       0       0  no_bom    text   noeol   noeol_dos.txt
+

Se pueden utilizar marcas extras opcionales para modificar la salida. Se pueden añadir una o más marcas.

@@ -285,6 +294,12 @@

PARÁMETROS

Muestra si el archivo es de texto o binario.

+ +
e
+
+ +

Print the type of the line break of the last line, or noeol if there is none.

+
c
@@ -293,6 +308,8 @@

PARÁMETROS

Con la marca c dos2unix sólo mostrará los archivos que contengan saltos de línea DOS, unix2dos sólo mostrará los nombres de archivo que tengan saltos de línea Unix.

+

If in addition option -e or --add-eol is used also the files that lack a line break on the last line will be printed.

+
h
@@ -330,6 +347,10 @@

PARÁMETROS

unix2dos -ic *.txt
+

List the files that have DOS line breaks or lack a line break on the last line:

+ +
dos2unix -e -ic *.txt
+

Convert only files that have DOS line breaks and leave the other files untouched:

dos2unix -ic0 *.txt | xargs -0 dos2unix
@@ -503,7 +524,7 @@

PARÁMETROS

MODO MAC

-

En modo normal los saltos de línea son convertidos de DOS a Unix y viceversa. Los saltos de línea Mac no son convertidos.

+

By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted.

En modo Mac los saltos de línea son convertidos de Mac a Unix y viceversa. Los saltos de línea DOS no son modificados.

@@ -516,9 +537,9 @@

MODOS DE CONVERSIÓN

ascii
-

En modo ascii sólo los saltos de línea son convertidos. Éste es el modo de conversión por defecto.

+

This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling ascii mode disables 7bit and iso mode.

-

Aunque el nombre de este modo es ASCII, que es un estándar de 7 bits, éste emplea 8 bits. Siempre use este modo cuando convierta archivos Unicode UTF-8.

+

If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling ascii mode disables the option to keep UTF-16 encoding (-u) and the options to assume UTF-16 input (-ul and -ub). To see if dos2unix has UTF-16 support type dos2unix -V. See also section UNICODE.

7bit
@@ -583,7 +604,7 @@

Codificaciones

Conversion

-

Los archivos de texto Unicode pueden tener saltos de línea DOS, Unix o Mac, como cualquier archivo de texto.

+

Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files.

Todas las versiones de dos2unix y unix2dos pueden convertir archivos codificados como UTF-8, debido a que UTF-8 fue diseñado para retro-compatibilidad con ASCII.

@@ -603,7 +624,7 @@

Conversion

Marca de orden de bytes

-

En Windows los archivos de texto Unicode típicamente tienen una Marca de Orden de Bytes (BOM), debido a que muchos programas de Windows (incluyendo el Bloc de Notas) añaden una BOM por defecto. Véase también http://es.wikipedia.org/wiki/Marca_de_orden_de_bytes_%28BOM%29.

+

On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also https://en.wikipedia.org/wiki/Byte_order_mark.

En Unix los archivos Unicode no suelen tener BOM. Se supone que los archivos de texto son codificados en la codificación local de caracteres.

@@ -643,7 +664,7 @@

Ejemplos Unicode

GB18030

-

GB18030 es un estándar del gobierno chino. Todo producto software vendido en China está obligado por ley a contener un subconjunto del GB18030 estándar. Véase http://en.wikipedia.org/wiki/GB_18030.

+

GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also https://en.wikipedia.org/wiki/GB_18030.

GB18030 es totalmente compatible con Unicode y puede considerarse como formato de transformación Unicode. Como ocurre con UTF-8, GB18030 es compatible con ASCII. GB18030 también es compatible con la página de códigos de Windows 936, también conocida como GBK.

@@ -742,7 +763,7 @@

INTERNACIONALIZACIÓN

export LANG=en_US.iso88591 Ingles, EE. UU., codificación Latín-1 export LANG=en_GB.UTF-8 Ingles, Reino Unido, codificación UTF-8 -

Para obtener una lista completa de códigos de idioma y país véase el manual de gettext: http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

+

For a complete list of language and country codes see the gettext manual: https://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

En sistemas Unix puede emplear el comando locale(1) para obtener información específica de locale.

@@ -750,7 +771,7 @@

INTERNACIONALIZACIÓN

LANGUAGE
-

Con la variable de entorno LANGUAGE puede especificar una lista de prioridad de los idiomas, separados por dos puntos. Dos2unix da preferencia a LANGUAGE sobre LANG. Por ejemplo, primero neerlandés y entonces alemán: LANGUAGE=nl:de. Para usar una lista de prioridad de idiomas a través de la variable LANGUAGE tiene que habilitar antes la internacionalización, asignando un valor distinto de "C" a LANG (o LC_ALL). Véase también el manual de gettext: http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

+

With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: LANGUAGE=nl:de. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than "C", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: https://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

Si selecciona un idioma que no está disponible el programa funcionará en ingles.

@@ -775,21 +796,21 @@

VALOR DE RETORNO

ESTÁNDARES

-

http://es.wikipedia.org/wiki/Documento_de_texto

+

https://en.wikipedia.org/wiki/Text_file

-

http://es.wikipedia.org/wiki/Retorno_de_carro

+

https://en.wikipedia.org/wiki/Carriage_return

-

http://es.wikipedia.org/wiki/Nueva_l%C3%ADnea

+

https://en.wikipedia.org/wiki/Newline

-

http://es.wikipedia.org/wiki/Unicode

+

https://en.wikipedia.org/wiki/Unicode

AUTORES

Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)

-

Página del proyecto: http://waterlan.home.xs4all.nl/dos2unix.html

+

Project page: https://waterlan.home.xs4all.nl/dos2unix.html

-

Página de SourceForge: http://sourceforge.net/projects/dos2unix/

+

SourceForge page: https://sourceforge.net/projects/dos2unix/

VÉASE TAMBIÉN

diff --git a/dos2unix/man/es/man1/dos2unix.pod b/dos2unix/man/es/man1/dos2unix.pod index babfe90..99f44ac 100644 --- a/dos2unix/man/es/man1/dos2unix.pod +++ b/dos2unix/man/es/man1/dos2unix.pod @@ -63,7 +63,7 @@ When this option is used, the conversion will not be aborted when the user and/o =item B<-ascii> -Sólo convierte los salto de línea. Éste es el modo de conversión por defecto. +Default conversion mode. See also section CONVERSION MODES. =item B<-iso> @@ -188,6 +188,15 @@ Ejemplo de salida: Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>. +If in addition option C<-e> or C<--add-eol> is used also the type of the line break of the last line is printed, or C if there is none. + +Ejemplo de salida: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Se pueden utilizar marcas extras opcionales para modificar la salida. Se pueden añadir una o más marcas. =over 4 @@ -216,12 +225,18 @@ Muestra la Marca de Orden de Byte. Muestra si el archivo es de texto o binario. +=item B + +Print the type of the line break of the last line, or C if there is none. + =item B Muestra sólo los archivos que pueden ser convertidos. Con la marca C dos2unix sólo mostrará los archivos que contengan saltos de línea DOS, unix2dos sólo mostrará los nombres de archivo que tengan saltos de línea Unix. +If in addition option C<-e> or C<--add-eol> is used also the files that lack a line break on the last line will be printed. + =item B Print a header. @@ -254,6 +269,10 @@ Muestra los archivos que tienen saltos de línea Unix: unix2dos -ic *.txt +List the files that have DOS line breaks or lack a line break on the last line: + + dos2unix -e -ic *.txt + Convert only files that have DOS line breaks and leave the other files untouched: dos2unix -ic0 *.txt | xargs -0 dos2unix @@ -388,7 +407,7 @@ Despiega la información de la versión y termina el programa. =head1 MODO MAC -En modo normal los saltos de línea son convertidos de DOS a Unix y viceversa. Los saltos de línea Mac no son convertidos. +By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted. En modo Mac los saltos de línea son convertidos de Mac a Unix y viceversa. Los saltos de línea DOS no son modificados. @@ -400,9 +419,9 @@ Para ejecutar en modo Mac use el modificador C<-c mac> o use los comandos C -En modo C sólo los saltos de línea son convertidos. Éste es el modo de conversión por defecto. +This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling B mode disables B<7bit> and B mode. -Aunque el nombre de este modo es ASCII, que es un estándar de 7 bits, éste emplea 8 bits. Siempre use este modo cuando convierta archivos Unicode UTF-8. +If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has UTF-16 support type C. See also section UNICODE. =item B<7bit> @@ -462,7 +481,7 @@ Existen diferentes codificaciones Unicode. En Unix y Linux los archivos Unicode =head2 Conversion -Los archivos de texto Unicode pueden tener saltos de línea DOS, Unix o Mac, como cualquier archivo de texto. +Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files. Todas las versiones de dos2unix y unix2dos pueden convertir archivos codificados como UTF-8, debido a que UTF-8 fue diseñado para retro-compatibilidad con ASCII. @@ -482,7 +501,7 @@ La conversión en modos ISO y 7-bit no funciona en archivos UTF-16. =head2 Marca de orden de bytes -En Windows los archivos de texto Unicode típicamente tienen una Marca de Orden de Bytes (BOM), debido a que muchos programas de Windows (incluyendo el Bloc de Notas) añaden una BOM por defecto. Véase también L. +On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L. En Unix los archivos Unicode no suelen tener BOM. Se supone que los archivos de texto son codificados en la codificación local de caracteres. @@ -522,7 +541,7 @@ Convertir de Unix UTF-8 a Windows UTF-16: =head1 GB18030 -GB18030 es un estándar del gobierno chino. Todo producto software vendido en China está obligado por ley a contener un subconjunto del GB18030 estándar. Véase L. +GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L. GB18030 es totalmente compatible con Unicode y puede considerarse como formato de transformación Unicode. Como ocurre con UTF-8, GB18030 es compatible con ASCII. GB18030 también es compatible con la página de códigos de Windows 936, también conocida como GBK. @@ -622,13 +641,13 @@ El idioma principal se selecciona con la variable de entorno LANG. La variable L export LANG=en_US.iso88591 Ingles, EE. UU., codificación Latín-1 export LANG=en_GB.UTF-8 Ingles, Reino Unido, codificación UTF-8 -Para obtener una lista completa de códigos de idioma y país véase el manual de gettext: L +For a complete list of language and country codes see the gettext manual: L En sistemas Unix puede emplear el comando locale(1) para obtener información específica de locale. =item B -Con la variable de entorno LANGUAGE puede especificar una lista de prioridad de los idiomas, separados por dos puntos. Dos2unix da preferencia a LANGUAGE sobre LANG. Por ejemplo, primero neerlandés y entonces alemán: C. Para usar una lista de prioridad de idiomas a través de la variable LANGUAGE tiene que habilitar antes la internacionalización, asignando un valor distinto de "C" a LANG (o LC_ALL). Véase también el manual de gettext: L +With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than "C", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L Si selecciona un idioma que no está disponible el programa funcionará en ingles. @@ -654,21 +673,21 @@ El valor de retorno es siempre cero en modo silencioso, excepto cuando se emplea =head1 ESTÁNDARES -L +L -L +L -L +L -L +L =head1 AUTORES Benjamin Lin - , Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer) -Página del proyecto: L +Project page: L -Página de SourceForge: L +SourceForge page: L =head1 VÉASE TAMBIÉN diff --git a/dos2unix/man/es/man1/dos2unix.txt b/dos2unix/man/es/man1/dos2unix.txt index da1d2e3..c66c6d4 100644 --- a/dos2unix/man/es/man1/dos2unix.txt +++ b/dos2unix/man/es/man1/dos2unix.txt @@ -67,8 +67,7 @@ PARÁMETROS user and group ownership of files. -ascii - Sólo convierte los salto de línea. Éste es el modo de conversión por - defecto. + Default conversion mode. See also section CONVERSION MODES. -iso Conversión entre el conjunto de caracteres DOS e ISO-8859-1. Véase @@ -221,6 +220,17 @@ PARÁMETROS Note that sometimes a binary file can be mistaken for a text file. See also option "-s". + If in addition option "-e" or "--add-eol" is used also the type of + the line break of the last line is printed, or "noeol" if there is + none. + + Ejemplo de salida: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Se pueden utilizar marcas extras opcionales para modificar la salida. Se pueden añadir una o más marcas. @@ -240,12 +250,18 @@ PARÁMETROS t Muestra si el archivo es de texto o binario. + e Print the type of the line break of the last line, or "noeol" if + there is none. + c Muestra sólo los archivos que pueden ser convertidos. Con la marca "c" dos2unix sólo mostrará los archivos que contengan saltos de línea DOS, unix2dos sólo mostrará los nombres de archivo que tengan saltos de línea Unix. + If in addition option "-e" or "--add-eol" is used also the files + that lack a line break on the last line will be printed. + h Print a header. p Show file names without path. @@ -272,6 +288,11 @@ PARÁMETROS unix2dos -ic *.txt + List the files that have DOS line breaks or lack a line break on the + last line: + + dos2unix -e -ic *.txt + Convert only files that have DOS line breaks and leave the other files untouched: @@ -448,8 +469,8 @@ PARÁMETROS Despiega la información de la versión y termina el programa. MODO MAC - En modo normal los saltos de línea son convertidos de DOS a Unix y - viceversa. Los saltos de línea Mac no son convertidos. + By default line breaks are converted from DOS to Unix and vice versa. + Mac line breaks are not converted. En modo Mac los saltos de línea son convertidos de Mac a Unix y viceversa. Los saltos de línea DOS no son modificados. @@ -459,12 +480,16 @@ MODO MAC MODOS DE CONVERSIÓN ascii - En modo "ascii" sólo los saltos de línea son convertidos. Éste es el - modo de conversión por defecto. + This is the default conversion mode. This mode is for converting + ASCII and ASCII-compatible encoded files, like UTF-8. Enabling ascii + mode disables 7bit and iso mode. - Aunque el nombre de este modo es ASCII, que es un estándar de 7 - bits, éste emplea 8 bits. Siempre use este modo cuando convierta - archivos Unicode UTF-8. + If dos2unix has UTF-16 support, UTF-16 encoded files are converted + to the current locale character encoding on POSIX systems and to + UTF-8 on Windows. Enabling ascii mode disables the option to keep + UTF-16 encoding ("-u") and the options to assume UTF-16 input ("-ul" + and "-ub"). To see if dos2unix has UTF-16 support type "dos2unix + -V". See also section UNICODE. 7bit En este modo todos los caracteres no ASCII de 8 bits (con valores de @@ -537,8 +562,8 @@ UNICODE endian, pero en general son codificados en formato UTF-16. Conversion - Los archivos de texto Unicode pueden tener saltos de línea DOS, Unix o - Mac, como cualquier archivo de texto. + Unicode text files can have DOS, Unix or Mac line breaks, like ASCII + text files. Todas las versiones de dos2unix y unix2dos pueden convertir archivos codificados como UTF-8, debido a que UTF-8 fue diseñado para @@ -573,10 +598,9 @@ UNICODE La conversión en modos ISO y 7-bit no funciona en archivos UTF-16. Marca de orden de bytes - En Windows los archivos de texto Unicode típicamente tienen una Marca de - Orden de Bytes (BOM), debido a que muchos programas de Windows - (incluyendo el Bloc de Notas) añaden una BOM por defecto. Véase también - . + On Windows Unicode text files typically have a Byte Order Mark (BOM), + because many Windows programs (including Notepad) add BOMs by default. + See also . En Unix los archivos Unicode no suelen tener BOM. Se supone que los archivos de texto son codificados en la codificación local de @@ -627,9 +651,9 @@ UNICODE unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt GB18030 - GB18030 es un estándar del gobierno chino. Todo producto software - vendido en China está obligado por ley a contener un subconjunto del - GB18030 estándar. Véase . + GB18030 is a Chinese government standard. A mandatory subset of the + GB18030 standard is officially required for all software products sold + in China. See also . GB18030 es totalmente compatible con Unicode y puede considerarse como formato de transformación Unicode. Como ocurre con UTF-8, GB18030 es @@ -744,24 +768,24 @@ INTERNACIONALIZACIÓN export LANG=en_US.iso88591 Ingles, EE. UU., codificación Latín-1 export LANG=en_GB.UTF-8 Ingles, Reino Unido, codificación UTF-8 - Para obtener una lista completa de códigos de idioma y país véase el - manual de gettext: - + For a complete list of language and country codes see the gettext + manual: + En sistemas Unix puede emplear el comando locale(1) para obtener información específica de locale. LANGUAGE - Con la variable de entorno LANGUAGE puede especificar una lista de - prioridad de los idiomas, separados por dos puntos. Dos2unix da - preferencia a LANGUAGE sobre LANG. Por ejemplo, primero neerlandés y - entonces alemán: "LANGUAGE=nl:de". Para usar una lista de prioridad - de idiomas a través de la variable LANGUAGE tiene que habilitar - antes la internacionalización, asignando un valor distinto de "C" a - LANG (o LC_ALL). Véase también el manual de gettext: - + With the LANGUAGE environment variable you can specify a priority + list of languages, separated by colons. Dos2unix gives preference to + LANGUAGE over LANG. For instance, first Dutch and then German: + "LANGUAGE=nl:de". You have to first enable localization, by setting + LANG (or LC_ALL) to a value other than "C", before you can use a + language priority list through the LANGUAGE variable. See also the + gettext manual: + Si selecciona un idioma que no está disponible el programa funcionará en ingles. @@ -786,13 +810,13 @@ VALOR DE RETORNO se emplean parámetros incorrectos. ESTÁNDARES - + - + - + - + AUTORES Benjamin Lin - , Bernd Johannes Wuebben (mac2unix @@ -800,9 +824,9 @@ AUTORES , Erwin Waterlander - (maintainer) - Página del proyecto: + Project page: - Página de SourceForge: + SourceForge page: VÉASE TAMBIÉN file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/dos2unix/man/fr/man1/dos2unix.1 b/dos2unix/man/fr/man1/dos2unix.1 index 67df530..e5188b5 100644 --- a/dos2unix/man/fr/man1/dos2unix.1 +++ b/dos2unix/man/fr/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2023-08-29" "dos2unix" "2023-08-29" +.TH dos2unix 1 "2024-01-22" "dos2unix" "2024-01-22" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -122,7 +122,7 @@ Autoriser le changement de propriétaire dans l'ancien mode de fichier. Quand cette option est utilisée, la conversion n'est pas interrompue si l'utilisateur ou le groupe propriétaire du fichier original ne peut pas être préservé dans l'ancien mode de fichier. La conversion continuera et le fichier converti aura le même nouveau propriétaire que si il avait été converti par le nouveau mode de fichier. Voyez aussi les options \f(CW\*(C`\-o\*(C'\fR et \f(CW\*(C`\-n\*(C'\fR. Cette option est uniquement disponible si dos2unix dispose des fonctionnalités pour préserver l'utilisateur ou le groupe propriétaire des fichiers. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" -Convertit uniquement les sauts de lignes. C'est le mode de conversion par défaut. +Mode de conversion par défaut. Voyez aussi la section des \s-1MODES DE CONVERSION.\s0 .IP "\fB\-iso\fR" 4 .IX Item "-iso" Convertit le jeu de caractères du \s-1DOS\s0 vers \s-1ISO\-8859\-1.\s0 Voyez aussi la section des \s-1MODES DE CONVERSION.\s0 @@ -224,6 +224,17 @@ Exemple de sortie : .Sp Notez qu'un fichier binaire peut parfois être considéré à tord comme un fichier texte. Voyez aussi l'option \f(CW\*(C`\-s\*(C'\fR. .Sp +Si l'option \f(CW\*(C`\-e\*(C'\fR ou \f(CW\*(C`\-\-add\-eol\*(C'\fR est également utilisée, le type du saut de ligne de la dernière ligne est affiché ou \f(CW\*(C`noeol\*(C'\fR est affiché s'il n'y en a pas. +.Sp +Exemple de sortie : +.Sp +.Vb 4 +\& 6 0 0 no_bom text dos dos.txt +\& 0 6 0 no_bom text unix unix.txt +\& 0 0 6 no_bom text mac mac.txt +\& 1 0 0 no_bom text noeol noeol_dos.txt +.Ve +.Sp Des fanions facultatifs peuvent être ajoutés pour changer la sortie. Un ou plusieurs fanions peuvent être ajoutés. .RS 4 .IP "\fB0\fR" 4 @@ -244,11 +255,16 @@ Afficher la marque d'ordre des octets. .IP "\fBt\fR" 4 .IX Item "t" Affiche si le fichier est texte ou binaire. +.IP "\fBe\fR" 4 +.IX Item "e" +Affiche le type du saut de ligne de la dernière ligne ou \f(CW\*(C`noeol\*(C'\fR s'il n'y en a pas. .IP "\fBc\fR" 4 .IX Item "c" Affiche uniquement les fichiers qui seraient convertis. .Sp Avec le fanion \f(CW\*(C`c\*(C'\fR, dos2unix n'affichera que les fichiers contenant des sauts de ligne \s-1DOS\s0 alors que unix2dos n'affichera que les noms des fichiers aillant des sauts de ligne Unix. +.Sp +Si l'option \f(CW\*(C`\-e\*(C'\fR ou \f(CW\*(C`\-\-add\-eol\*(C'\fR est également utilisée, les fichiers qui n'ont pas de saut de ligne à la dernière ligne seront affichés. .IP "\fBh\fR" 4 .IX Item "h" Afficher un en\-tête. @@ -290,6 +306,12 @@ Liste les fichiers qui ont des sauts de ligne Unix : \& unix2dos \-ic *.txt .Ve .Sp +Liste les fichiers qui ont des sauts de ligne \s-1DOS\s0 ou qui n'ont pas de saut de ligne à la dernière ligne. +.Sp +.Vb 1 +\& dos2unix \-e \-ic *.txt +.Ve +.Sp Ne converti que les fichiers qui ont des sauts de lignes \s-1DOS\s0 et laisse les autres fichiers inchangés: .Sp .Vb 1 @@ -410,7 +432,7 @@ Ne change pas les liens symboliques ni les cibles (par défaut). Affiche les informations de version puis arrête. .SH "MODE MAC" .IX Header "MODE MAC" -En mode normal, les sauts de lignes sont convertis du \s-1DOS\s0 vers Unix et inversement. Les sauts de lignes Mac ne sont pas convertis. +Par défaut, les sauts de lignes sont convertis du \s-1DOS\s0 vers Unix et inversement. Les sauts de lignes Mac ne sont pas convertis. .PP En mode Mac, les sauts de lignes sont convertis du format Mac au format Unix et inversement. Les sauts de lignes \s-1DOS\s0 ne sont pas changés. .PP @@ -419,9 +441,9 @@ Pour fonctionner en mode Mac, utilisez l'option en ligne de commande \f(CW\*(C`\ .IX Header "MODES DE CONVERSION" .IP "\fBascii\fR" 4 .IX Item "ascii" -En mode \f(CW\*(C`ascii\*(C'\fR, seuls les sauts de lignes sont convertis. Ceci est le mode de conversion par défaut. +Ceci est le mode de conversion par défaut. Ce mode convertit les fichiers \s-1ASCII\s0 en fichiers compatibles avec l'\s-1ASCII\s0 tel que \s-1UTF\-9.\s0 Activer le mode \fBascii\fR désactive les modes \fB7bit\fR et \fBiso\fR. .Sp -Bien que le nom de ce mode soit \s-1ASCII,\s0 qui est un standard 7 bits, ce mode travail en réalité sur 8 bits. Utilisez toujours ce mode lorsque vous convertissez des fichiers Unicode \s-1UTF\-8.\s0 +Si dos2unix supporte \s-1UTF\-16,\s0 les fichiers encodés en \s-1UTF\-16\s0 sont convertis vers l'encodage des caractères des paramètres linguistiques courants sur les systèmes \s-1POSIX\s0 et vers \s-1UTF\-8\s0 sous Windows. Activer le mode \fBascii\fR désactive l'option pour garder l'encodage \s-1UTF\-8\s0 (\f(CW\*(C`\-u\*(C'\fR) et les options qui supposent une entrée en \s-1UTF\-16\s0 (\f(CW\*(C`\-ul\*(C'\fR et \f(CW\*(C`\-ub\*(C'\fR). Pour voir si dos2unix supporte \s-1UTF\-16,\s0 tapez \f(CW\*(C`dos2unix \-V\*(C'\fR. Consultez aussi la section \s-1UNICODE.\s0 .IP "\fB7bit\fR" 4 .IX Item "7bit" Dans ce mode, tous les caractères 8 bits non \s-1ASCII\s0 (avec des valeurs entre 128 et 255) sont remplacés par une espace 7 bits. @@ -491,7 +513,7 @@ Consultez aussi et . +Les fichiers textes Unicode sous Windows on généralement un indicateur d'ordre des octets (\s-1BOM\s0) car de nombreux programmes Windows (y compris Notepad) ajoutent cet indicateur par défaut. Consultez aussi . .PP Sous Unix, les fichiers Unicodes n'ont habituellement pas de \s-1BOM.\s0 Il est supposé que les fichiers textes sont codés selon le codage de l'environnement linguistique. .PP @@ -555,7 +577,7 @@ Convertir de l'\s-1UTF\-8\s0 de Unix vers l'\s-1UTF\-16\s0 de Windows : .Ve .SH "GB18030" .IX Header "GB18030" -\&\s-1GB18030\s0 est un standard du gouvernement chinois. Tout logiciel vendu en Chine doit officiellement supporter un sous ensemble obligatoire du standard \s-1GB18030.\s0 Consultez . +\&\s-1GB18030\s0 est un standard du gouvernement chinois. Tout logiciel vendu en Chine doit officiellement supporter un sous ensemble obligatoire du standard \s-1GB18030.\s0 Consultez . .PP \&\s-1GB18030\s0 est entièrement compatible avec Unicode et peut être considéré comme étant un format de transformation unicode. Comme \s-1UTF\-8, GB18030\s0 est compatible avec \s-1ASCII. GB18030\s0 est aussi compatible avec le code page 936 de Windows aussi connu comme \s-1GBK.\s0 .PP @@ -681,12 +703,12 @@ La langue principale est sélectionnée par la variable d'environnement \s-1LANG \& export LANG=en_GB.UTF\-8 Anglais, UK, codage UTF\-8 .Ve .Sp -La liste complète des codes de langues et de pays est dans le manuel de gettext: +La liste complète des codes de langues et de pays est dans le manuel de gettext: .Sp Sur les systèmes Unix, vous pouvez utiliser la commande \fBlocale\fR\|(1) pour obtenir des informations sur l'environnement linguistique. .IP "\fB\s-1LANGUE\s0\fR" 4 .IX Item "LANGUE" -Avec la variable d'environnement \s-1LANGUAGE,\s0 vous pouvez spécifier une liste de langues prioritaires séparées par des deux-points. Dos2unix fait passer \s-1LANGUAGE\s0 avant \s-1LANG.\s0 Par exemple, pour utiliser le français avant l'anglais: \f(CW\*(C`LANGUAGE=fr:en\*(C'\fR. Vous devez d'abord activer l'environnement linguistique en assignant une valeur autre que « C » à \s-1LANG\s0 (ou \s-1LC_ALL\s0). Ensuite, vous pourrez utiliser la liste de priorité avec la variable \s-1LANGUAGE.\s0 Voyez également le manuel de gettext: +Avec la variable d'environnement \s-1LANGUAGE,\s0 vous pouvez spécifier une liste de langues prioritaires séparées par des deux-points. Dos2unix fait passer \s-1LANGUAGE\s0 avant \s-1LANG.\s0 Par exemple, pour utiliser le français avant l'anglais: \f(CW\*(C`LANGUAGE=fr:en\*(C'\fR. Vous devez d'abord activer l'environnement linguistique en assignant une valeur autre que « C » à \s-1LANG\s0 (ou \s-1LC_ALL\s0). Ensuite, vous pourrez utiliser la liste de priorité avec la variable \s-1LANGUAGE.\s0 Voyez également le manuel de gettext: .Sp Si vous sélectionnez une langue qui n'est pas disponible, vous obtiendrez des messages en anglais standard. .IP "\fB\s-1DOS2UNIX_LOCALEDIR\s0\fR" 4 @@ -705,20 +727,20 @@ Zéro est retourné en cas de succès. Si une erreur système se produit, la der La valeur de sortie est toujours zéro en mode silencieux sauf quand de mauvaises options sont utilisées sur la ligne de commande. .SH "STANDARDS" .IX Header "STANDARDS" - + .PP - + .PP - + .PP - + .SH "AUTEURS" .IX Header "AUTEURS" Benjamin Lin \- , Bernd Johannes Wuebben (mode mac2unix) \- , Christian Wurll (ajout de saut de ligne supplémentaire) \- , Erwin Waterlander \- (Mainteneur) .PP -Page du projet: +Page du projet: .PP -Page SourceForge: +Page SourceForge: .SH "VOIR AUSSI" .IX Header "VOIR AUSSI" \&\fBfile\fR\|(1) \fBfind\fR\|(1) \fBiconv\fR\|(1) \fBlocale\fR\|(1) \fBxargs\fR\|(1) diff --git a/dos2unix/man/fr/man1/dos2unix.htm b/dos2unix/man/fr/man1/dos2unix.htm index 2427c93..3aadc9b 100644 --- a/dos2unix/man/fr/man1/dos2unix.htm +++ b/dos2unix/man/fr/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.5.1 - Convertit les fichiers textes du format DOS/Mac vers Unix et inversement +dos2unix 7.5.2 - Convertit les fichiers textes du format DOS/Mac vers Unix et inversement @@ -89,7 +89,7 @@

OPTIONS

-ascii
-

Convertit uniquement les sauts de lignes. C'est le mode de conversion par défaut.

+

Mode de conversion par défaut. Voyez aussi la section des MODES DE CONVERSION.

-iso
@@ -246,6 +246,15 @@

OPTIONS

Notez qu'un fichier binaire peut parfois être considéré à tord comme un fichier texte. Voyez aussi l'option -s.

+

Si l'option -e ou --add-eol est également utilisée, le type du saut de ligne de la dernière ligne est affiché ou noeol est affiché s'il n'y en a pas.

+ +

Exemple de sortie :

+ +
6       0       0  no_bom    text   dos     dos.txt
+0       6       0  no_bom    text   unix    unix.txt
+0       0       6  no_bom    text   mac     mac.txt
+1       0       0  no_bom    text   noeol   noeol_dos.txt
+

Des fanions facultatifs peuvent être ajoutés pour changer la sortie. Un ou plusieurs fanions peuvent être ajoutés.

@@ -285,6 +294,12 @@

OPTIONS

Affiche si le fichier est texte ou binaire.

+ +
e
+
+ +

Affiche le type du saut de ligne de la dernière ligne ou noeol s'il n'y en a pas.

+
c
@@ -293,6 +308,8 @@

OPTIONS

Avec le fanion c, dos2unix n'affichera que les fichiers contenant des sauts de ligne DOS alors que unix2dos n'affichera que les noms des fichiers aillant des sauts de ligne Unix.

+

Si l'option -e ou --add-eol est également utilisée, les fichiers qui n'ont pas de saut de ligne à la dernière ligne seront affichés.

+
h
@@ -330,6 +347,10 @@

OPTIONS

unix2dos -ic *.txt
+

Liste les fichiers qui ont des sauts de ligne DOS ou qui n'ont pas de saut de ligne à la dernière ligne.

+ +
dos2unix -e -ic *.txt
+

Ne converti que les fichiers qui ont des sauts de lignes DOS et laisse les autres fichiers inchangés:

dos2unix -ic0 *.txt | xargs -0 dos2unix
@@ -503,7 +524,7 @@

OPTIONS

MODE MAC

-

En mode normal, les sauts de lignes sont convertis du DOS vers Unix et inversement. Les sauts de lignes Mac ne sont pas convertis.

+

Par défaut, les sauts de lignes sont convertis du DOS vers Unix et inversement. Les sauts de lignes Mac ne sont pas convertis.

En mode Mac, les sauts de lignes sont convertis du format Mac au format Unix et inversement. Les sauts de lignes DOS ne sont pas changés.

@@ -516,9 +537,9 @@

MODES DE CONVERSION

ascii
-

En mode ascii, seuls les sauts de lignes sont convertis. Ceci est le mode de conversion par défaut.

+

Ceci est le mode de conversion par défaut. Ce mode convertit les fichiers ASCII en fichiers compatibles avec l'ASCII tel que UTF-9. Activer le mode ascii désactive les modes 7bit et iso.

-

Bien que le nom de ce mode soit ASCII, qui est un standard 7 bits, ce mode travail en réalité sur 8 bits. Utilisez toujours ce mode lorsque vous convertissez des fichiers Unicode UTF-8.

+

Si dos2unix supporte UTF-16, les fichiers encodés en UTF-16 sont convertis vers l'encodage des caractères des paramètres linguistiques courants sur les systèmes POSIX et vers UTF-8 sous Windows. Activer le mode ascii désactive l'option pour garder l'encodage UTF-8 (-u) et les options qui supposent une entrée en UTF-16 (-ul et -ub). Pour voir si dos2unix supporte UTF-16, tapez dos2unix -V. Consultez aussi la section UNICODE.

7bit
@@ -583,7 +604,7 @@

Codages

Conversion

-

Les fichiers textes Unicode peuvent avoir des sauts de lignes DOS, Unix ou Mac, tout comme les fichiers textes normaux.

+

Les fichiers textes Unicode peuvent avoir des sauts de lignes DOS, Unix ou Mac, tout comme les fichiers textes ASCII.

Toutes les versions de dos2unix et unix2dos peuvent convertir des fichiers codés en UTF-8 car UTF-8 a été conçu pour être rétro-compatible avec l'ASCII.

@@ -603,7 +624,7 @@

Conversion

Marque d'ordre des octets

-

Les fichiers textes Unicode sous Windows on généralement un indicateur d'ordre des octets (BOM) car de nombreux programmes Windows (y compris Notepad) ajoutent cet indicateur par défaut. Consultez aussi http://fr.wikipedia.org/wiki/Indicateur_d%27ordre_des_octets.

+

Les fichiers textes Unicode sous Windows on généralement un indicateur d'ordre des octets (BOM) car de nombreux programmes Windows (y compris Notepad) ajoutent cet indicateur par défaut. Consultez aussi https://fr.wikipedia.org/wiki/Indicateur_d%27ordre_des_octets.

Sous Unix, les fichiers Unicodes n'ont habituellement pas de BOM. Il est supposé que les fichiers textes sont codés selon le codage de l'environnement linguistique.

@@ -643,7 +664,7 @@

Exemples Unicode

GB18030

-

GB18030 est un standard du gouvernement chinois. Tout logiciel vendu en Chine doit officiellement supporter un sous ensemble obligatoire du standard GB18030. Consultez http://fr.wikipedia.org/wiki/GB_18030.

+

GB18030 est un standard du gouvernement chinois. Tout logiciel vendu en Chine doit officiellement supporter un sous ensemble obligatoire du standard GB18030. Consultez https://fr.wikipedia.org/wiki/GB_18030.

GB18030 est entièrement compatible avec Unicode et peut être considéré comme étant un format de transformation unicode. Comme UTF-8, GB18030 est compatible avec ASCII. GB18030 est aussi compatible avec le code page 936 de Windows aussi connu comme GBK.

@@ -743,7 +764,7 @@

PARAMÈTRES LINGUISTIQUES

export LANG=en_US.iso88591 Anglais, USA, codage Latin-1 export LANG=en_GB.UTF-8 Anglais, UK, codage UTF-8 -

La liste complète des codes de langues et de pays est dans le manuel de gettext: http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

+

La liste complète des codes de langues et de pays est dans le manuel de gettext: https://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

Sur les systèmes Unix, vous pouvez utiliser la commande locale(1) pour obtenir des informations sur l'environnement linguistique.

@@ -751,7 +772,7 @@

PARAMÈTRES LINGUISTIQUES

LANGUE
-

Avec la variable d'environnement LANGUAGE, vous pouvez spécifier une liste de langues prioritaires séparées par des deux-points. Dos2unix fait passer LANGUAGE avant LANG. Par exemple, pour utiliser le français avant l'anglais: LANGUAGE=fr:en. Vous devez d'abord activer l'environnement linguistique en assignant une valeur autre que « C » à LANG (ou LC_ALL). Ensuite, vous pourrez utiliser la liste de priorité avec la variable LANGUAGE. Voyez également le manuel de gettext: http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

+

Avec la variable d'environnement LANGUAGE, vous pouvez spécifier une liste de langues prioritaires séparées par des deux-points. Dos2unix fait passer LANGUAGE avant LANG. Par exemple, pour utiliser le français avant l'anglais: LANGUAGE=fr:en. Vous devez d'abord activer l'environnement linguistique en assignant une valeur autre que « C » à LANG (ou LC_ALL). Ensuite, vous pourrez utiliser la liste de priorité avec la variable LANGUAGE. Voyez également le manuel de gettext: https://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

Si vous sélectionnez une langue qui n'est pas disponible, vous obtiendrez des messages en anglais standard.

@@ -776,21 +797,21 @@

VALEUR DE RETOUR

STANDARDS

-

http://fr.wikipedia.org/wiki/Fichier_texte

+

https://fr.wikipedia.org/wiki/Fichier_texte

-

http://fr.wikipedia.org/wiki/Retour_chariot

+

https://fr.wikipedia.org/wiki/Retour_chariot

-

http://fr.wikipedia.org/wiki/Fin_de_ligne

+

https://fr.wikipedia.org/wiki/Fin_de_ligne

-

http://fr.wikipedia.org/wiki/Unicode

+

https://fr.wikipedia.org/wiki/Unicode

AUTEURS

Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mode mac2unix) - <wuebben@kde.org>, Christian Wurll (ajout de saut de ligne supplémentaire) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (Mainteneur)

-

Page du projet: http://waterlan.home.xs4all.nl/dos2unix.html

+

Page du projet: https://waterlan.home.xs4all.nl/dos2unix.html

-

Page SourceForge: http://sourceforge.net/projects/dos2unix/

+

Page SourceForge: https://sourceforge.net/projects/dos2unix/

VOIR AUSSI

diff --git a/dos2unix/man/fr/man1/dos2unix.pod b/dos2unix/man/fr/man1/dos2unix.pod index 79436b1..e82f605 100644 --- a/dos2unix/man/fr/man1/dos2unix.pod +++ b/dos2unix/man/fr/man1/dos2unix.pod @@ -63,7 +63,7 @@ Quand cette option est utilisée, la conversion n'est pas interrompue si l'utili =item B<-ascii> -Convertit uniquement les sauts de lignes. C'est le mode de conversion par défaut. +Mode de conversion par défaut. Voyez aussi la section des MODES DE CONVERSION. =item B<-iso> @@ -188,6 +188,15 @@ Exemple de S Notez qu'un fichier binaire peut parfois être considéré à tord comme un fichier texte. Voyez aussi l'option C<-s>. +Si l'option C<-e> ou C<--add-eol> est également utilisée, le type du saut de ligne de la dernière ligne est affiché ou C est affiché s'il n'y en a pas. + +Exemple de S + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Des fanions facultatifs peuvent être ajoutés pour changer la sortie. Un ou plusieurs fanions peuvent être ajoutés. =over 4 @@ -216,12 +225,18 @@ Afficher la marque d'ordre des octets. Affiche si le fichier est texte ou binaire. +=item B + +Affiche le type du saut de ligne de la dernière ligne ou C s'il n'y en a pas. + =item B Affiche uniquement les fichiers qui seraient convertis. Avec le fanion C, dos2unix n'affichera que les fichiers contenant des sauts de ligne DOS alors que unix2dos n'affichera que les noms des fichiers aillant des sauts de ligne Unix. +Si l'option C<-e> ou C<--add-eol> est également utilisée, les fichiers qui n'ont pas de saut de ligne à la dernière ligne seront affichés. + =item B Afficher un en-tête. @@ -254,6 +269,10 @@ Liste les fichiers qui ont des sauts de ligne Unix : unix2dos -ic *.txt +Liste les fichiers qui ont des sauts de ligne DOS ou qui n'ont pas de saut de ligne à la dernière ligne. + + dos2unix -e -ic *.txt + Ne converti que les fichiers qui ont des sauts de lignes DOS et laisse les autres fichiers inchangés: dos2unix -ic0 *.txt | xargs -0 dos2unix @@ -388,7 +407,7 @@ Affiche les informations de version puis arrête. =head1 MODE MAC -En mode normal, les sauts de lignes sont convertis du DOS vers Unix et inversement. Les sauts de lignes Mac ne sont pas convertis. +Par défaut, les sauts de lignes sont convertis du DOS vers Unix et inversement. Les sauts de lignes Mac ne sont pas convertis. En mode Mac, les sauts de lignes sont convertis du format Mac au format Unix et inversement. Les sauts de lignes DOS ne sont pas changés. @@ -400,9 +419,9 @@ Pour fonctionner en mode Mac, utilisez l'option en ligne de commande C<-c mac> o =item B -En mode C, seuls les sauts de lignes sont convertis. Ceci est le mode de conversion par défaut. +Ceci est le mode de conversion par défaut. Ce mode convertit les fichiers ASCII en fichiers compatibles avec l'ASCII tel que UTF-9. Activer le mode B désactive les modes B<7bit> et B. -Bien que le nom de ce mode soit ASCII, qui est un standard 7 bits, ce mode travail en réalité sur 8 bits. Utilisez toujours ce mode lorsque vous convertissez des fichiers Unicode UTF-8. +Si dos2unix supporte UTF-16, les fichiers encodés en UTF-16 sont convertis vers l'encodage des caractères des paramètres linguistiques courants sur les systèmes POSIX et vers UTF-8 sous Windows. Activer le mode B désactive l'option pour garder l'encodage UTF-8 (C<-u>) et les options qui supposent une entrée en UTF-16 (C<-ul> et C<-ub>). Pour voir si dos2unix supporte UTF-16, tapez C. Consultez aussi la section UNICODE. =item B<7bit> @@ -462,7 +481,7 @@ Il existe plusieurs codages Unicode. Sous Unix et Linux, les fichiers sont gén =head2 Conversion -Les fichiers textes Unicode peuvent avoir des sauts de lignes DOS, Unix ou Mac, tout comme les fichiers textes normaux. +Les fichiers textes Unicode peuvent avoir des sauts de lignes DOS, Unix ou Mac, tout comme les fichiers textes ASCII. Toutes les versions de dos2unix et unix2dos peuvent convertir des fichiers codés en UTF-8 car UTF-8 a été conçu pour être rétro-compatible avec l'ASCII. @@ -482,7 +501,7 @@ Les modes de conversion ISO et 7 bits ne fonctionnent pas sur des fichiers UTF-1 =head2 Marque d'ordre des octets -Les fichiers textes Unicode sous Windows on généralement un indicateur d'ordre des octets (BOM) car de nombreux programmes Windows (y compris Notepad) ajoutent cet indicateur par défaut. Consultez aussi L. +Les fichiers textes Unicode sous Windows on généralement un indicateur d'ordre des octets (BOM) car de nombreux programmes Windows (y compris Notepad) ajoutent cet indicateur par défaut. Consultez aussi L. Sous Unix, les fichiers Unicodes n'ont habituellement pas de BOM. Il est supposé que les fichiers textes sont codés selon le codage de l'environnement linguistique. @@ -522,7 +541,7 @@ Convertir de l'UTF-8 de Unix vers l'UTF-16 de Windows : =head1 GB18030 -GB18030 est un standard du gouvernement chinois. Tout logiciel vendu en Chine doit officiellement supporter un sous ensemble obligatoire du standard GB18030. Consultez L. +GB18030 est un standard du gouvernement chinois. Tout logiciel vendu en Chine doit officiellement supporter un sous ensemble obligatoire du standard GB18030. Consultez L. GB18030 est entièrement compatible avec Unicode et peut être considéré comme étant un format de transformation unicode. Comme UTF-8, GB18030 est compatible avec ASCII. GB18030 est aussi compatible avec le code page 936 de Windows aussi connu comme GBK. @@ -624,13 +643,13 @@ La langue principale est sélectionnée par la variable d'environnement LANG. La export LANG=en_US.iso88591 Anglais, USA, codage Latin-1 export LANG=en_GB.UTF-8 Anglais, UK, codage UTF-8 -La liste complète des codes de langues et de pays est dans le manuel de gettext: L +La liste complète des codes de langues et de pays est dans le manuel de gettext: L Sur les systèmes Unix, vous pouvez utiliser la commande locale(1) pour obtenir des informations sur l'environnement linguistique. =item B -Avec la variable d'environnement LANGUAGE, vous pouvez spécifier une liste de langues prioritaires séparées par des deux-points. Dos2unix fait passer LANGUAGE avant LANG. Par exemple, pour utiliser le français avant l'anglais: C. Vous devez d'abord activer l'environnement linguistique en assignant une valeur autre que S<« C »> à LANG (ou LC_ALL). Ensuite, vous pourrez utiliser la liste de priorité avec la variable LANGUAGE. Voyez également le manuel de gettext: L +Avec la variable d'environnement LANGUAGE, vous pouvez spécifier une liste de langues prioritaires séparées par des deux-points. Dos2unix fait passer LANGUAGE avant LANG. Par exemple, pour utiliser le français avant l'anglais: C. Vous devez d'abord activer l'environnement linguistique en assignant une valeur autre que S<« C »> à LANG (ou LC_ALL). Ensuite, vous pourrez utiliser la liste de priorité avec la variable LANGUAGE. Voyez également le manuel de gettext: L Si vous sélectionnez une langue qui n'est pas disponible, vous obtiendrez des messages en anglais standard. @@ -656,21 +675,21 @@ La valeur de sortie est toujours zéro en mode silencieux sauf quand de mauvaise =head1 STANDARDS -L +L -L +L -L +L -L +L =head1 AUTEURS Benjamin Lin - , Bernd Johannes Wuebben (mode mac2unix) - , Christian Wurll (ajout de saut de ligne supplémentaire) - , Erwin Waterlander - (Mainteneur) -Page du projet: L +Page du projet: L -Page SourceForge: L +Page SourceForge: L =head1 VOIR AUSSI diff --git a/dos2unix/man/fr/man1/dos2unix.txt b/dos2unix/man/fr/man1/dos2unix.txt index 0287637..66f8e06 100644 --- a/dos2unix/man/fr/man1/dos2unix.txt +++ b/dos2unix/man/fr/man1/dos2unix.txt @@ -70,8 +70,8 @@ OPTIONS l'utilisateur ou le groupe propriétaire des fichiers. -ascii - Convertit uniquement les sauts de lignes. C'est le mode de - conversion par défaut. + Mode de conversion par défaut. Voyez aussi la section des MODES DE + CONVERSION. -iso Convertit le jeu de caractères du DOS vers ISO-8859-1. Voyez aussi @@ -233,6 +233,17 @@ OPTIONS Notez qu'un fichier binaire peut parfois être considéré à tord comme un fichier texte. Voyez aussi l'option "-s". + Si l'option "-e" ou "--add-eol" est également utilisée, le type du + saut de ligne de la dernière ligne est affiché ou "noeol" est + affiché s'il n'y en a pas. + + Exemple de sortie : + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Des fanions facultatifs peuvent être ajoutés pour changer la sortie. Un ou plusieurs fanions peuvent être ajoutés. @@ -252,12 +263,19 @@ OPTIONS t Affiche si le fichier est texte ou binaire. + e Affiche le type du saut de ligne de la dernière ligne ou "noeol" + s'il n'y en a pas. + c Affiche uniquement les fichiers qui seraient convertis. Avec le fanion "c", dos2unix n'affichera que les fichiers contenant des sauts de ligne DOS alors que unix2dos n'affichera que les noms des fichiers aillant des sauts de ligne Unix. + Si l'option "-e" ou "--add-eol" est également utilisée, les + fichiers qui n'ont pas de saut de ligne à la dernière ligne + seront affichés. + h Afficher un en-tête. p Montrer les noms des fichiers sans le chemin. @@ -284,6 +302,11 @@ OPTIONS unix2dos -ic *.txt + Liste les fichiers qui ont des sauts de ligne DOS ou qui n'ont pas + de saut de ligne à la dernière ligne. + + dos2unix -e -ic *.txt + Ne converti que les fichiers qui ont des sauts de lignes DOS et laisse les autres fichiers inchangés: @@ -473,7 +496,7 @@ OPTIONS Affiche les informations de version puis arrête. MODE MAC - En mode normal, les sauts de lignes sont convertis du DOS vers Unix et + Par défaut, les sauts de lignes sont convertis du DOS vers Unix et inversement. Les sauts de lignes Mac ne sont pas convertis. En mode Mac, les sauts de lignes sont convertis du format Mac au format @@ -484,12 +507,17 @@ MODE MAC MODES DE CONVERSION ascii - En mode "ascii", seuls les sauts de lignes sont convertis. Ceci est - le mode de conversion par défaut. - - Bien que le nom de ce mode soit ASCII, qui est un standard 7 bits, - ce mode travail en réalité sur 8 bits. Utilisez toujours ce mode - lorsque vous convertissez des fichiers Unicode UTF-8. + Ceci est le mode de conversion par défaut. Ce mode convertit les + fichiers ASCII en fichiers compatibles avec l'ASCII tel que UTF-9. + Activer le mode ascii désactive les modes 7bit et iso. + + Si dos2unix supporte UTF-16, les fichiers encodés en UTF-16 sont + convertis vers l'encodage des caractères des paramètres + linguistiques courants sur les systèmes POSIX et vers UTF-8 sous + Windows. Activer le mode ascii désactive l'option pour garder + l'encodage UTF-8 ("-u") et les options qui supposent une entrée en + UTF-16 ("-ul" et "-ub"). Pour voir si dos2unix supporte UTF-16, + tapez "dos2unix -V". Consultez aussi la section UNICODE. 7bit Dans ce mode, tous les caractères 8 bits non ASCII (avec des valeurs @@ -561,7 +589,7 @@ UNICODE Conversion Les fichiers textes Unicode peuvent avoir des sauts de lignes DOS, Unix - ou Mac, tout comme les fichiers textes normaux. + ou Mac, tout comme les fichiers textes ASCII. Toutes les versions de dos2unix et unix2dos peuvent convertir des fichiers codés en UTF-8 car UTF-8 a été conçu pour être rétro-compatible @@ -601,7 +629,7 @@ UNICODE Les fichiers textes Unicode sous Windows on généralement un indicateur d'ordre des octets (BOM) car de nombreux programmes Windows (y compris Notepad) ajoutent cet indicateur par défaut. Consultez aussi - . + . Sous Unix, les fichiers Unicodes n'ont habituellement pas de BOM. Il est supposé que les fichiers textes sont codés selon le codage de @@ -658,7 +686,7 @@ UNICODE GB18030 GB18030 est un standard du gouvernement chinois. Tout logiciel vendu en Chine doit officiellement supporter un sous ensemble obligatoire du - standard GB18030. Consultez . + standard GB18030. Consultez . GB18030 est entièrement compatible avec Unicode et peut être considéré comme étant un format de transformation unicode. Comme UTF-8, GB18030 @@ -780,8 +808,8 @@ PARAMÈTRES LINGUISTIQUES La liste complète des codes de langues et de pays est dans le manuel de gettext: - + Sur les systèmes Unix, vous pouvez utiliser la commande locale(1) pour obtenir des informations sur l'environnement linguistique. @@ -795,8 +823,8 @@ PARAMÈTRES LINGUISTIQUES que « C » à LANG (ou LC_ALL). Ensuite, vous pourrez utiliser la liste de priorité avec la variable LANGUAGE. Voyez également le manuel de gettext: - + Si vous sélectionnez une langue qui n'est pas disponible, vous obtiendrez des messages en anglais standard. @@ -821,13 +849,13 @@ VALEUR DE RETOUR mauvaises options sont utilisées sur la ligne de commande. STANDARDS - + - + - + - + AUTEURS Benjamin Lin - , Bernd Johannes Wuebben (mode @@ -835,9 +863,9 @@ AUTEURS supplémentaire) - , Erwin Waterlander - (Mainteneur) - Page du projet: + Page du projet: - Page SourceForge: + Page SourceForge: VOIR AUSSI file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/dos2unix/man/ko/man1/dos2unix.1 b/dos2unix/man/ko/man1/dos2unix.1 index e888e5a..7cecab1 100644 --- a/dos2unix/man/ko/man1/dos2unix.1 +++ b/dos2unix/man/ko/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2023-08-29" "dos2unix" "2023-08-29" +.TH dos2unix 1 "2024-01-22" "dos2unix" "2024-01-22" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -122,7 +122,7 @@ dos2unix는 SunOS/솔라리스의 dos2unix가 나온 후 구성한 모델입니 이 옵션을 사용하면 이전 파일의 사용자 또는 그룹 소유권을 유지할 수 없을 때 변환을 멈추지 않습니다. 새 파일의 모드로 변환할 때 처럼 동일하게 변환한 파일에 새 소유권을 부여하면서 변환을 계속합니다. \f(CW\*(C`\-o\*(C'\fR, \f(CW\*(C`\-n\*(C'\fR 옵션도 참고하십시오. 이 옵션은 dos2unix에서 파일의 사용자 및 그룹 소유권을 유지하는 기능이 있을 경우에만 사용할 수 있습니다. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" -줄 바꿈 문자만 변환합니다. 기본 변환 모드입니다. +기본 변환 모드입니다. 변환 모드 섹션을 참고하십시오. .IP "\fB\-iso\fR" 4 .IX Item "-iso" DOS와 \s-1ISO\-8859\-1\s0 문자 세트 변환을 진행합니다. 변환 모드 섹션을 참고하십시오. @@ -172,14 +172,14 @@ dos2unix의 기본 방식은 \s-1ANSI\s0 인코딩 텍스트를 활용하는 방 .Sp ConEmu 콘솔을 사용한다면 ConEmu에서 적절한 글꼴을 자동으로 선택하므로 모든 텍스트가 제대로 나타납니다. .Sp -유니코드 사용의 단점은 ASCII와 호환성이 없다는 점입니다. 다른 프로그램으로 출력을 전달할 때 쉽게 처리할 수 없습니다. +유니코드 사용의 단점은 아스키와 호환성이 없다는 점입니다. 다른 프로그램으로 출력을 전달할 때 쉽게 처리할 수 없습니다. .Sp \&\f(CW\*(C`unicodebom\*(C'\fR 방식을 사용하면 \s-1BOM\s0(바이트 순서 표시)을 텍스트 앞에 둡니다. BOM은 파워셸에서 출력 내용을 올바르게 전달 또는 파이핑할 때 필요합니다. .IP "\fButf8, utf8bom\fR" 4 .IX Item "utf8, utf8bom" -utf8의 장점은 ASCII와의 호환성입니다. 콘솔의 글꼴을 트루타입 글꼴로 선택해야 합니다. 트루타입 글꼴로 설정하면 \f(CW\*(C`unicode\*(C'\fR 인코딩 때와 비슷하게 나타납니다. +utf8의 장점은 아스키와의 호환성입니다. 콘솔의 글꼴을 트루타입 글꼴로 선택해야 합니다. 트루타입 글꼴로 설정하면 \f(CW\*(C`unicode\*(C'\fR 인코딩 때와 비슷하게 나타납니다. .Sp -단점은 래스터 글꼴을 기본으로 사용하면 \s-1ASCII\s0 인코딩 하지 않는 문자를 잘못 나타낼 수 있습니다. 유니코드 파일 이름 뿐만 아니라 번역 메시지 조차 제대로 읽을 수 없습니다. 윈도우에서는 동아시아 지역으로 설정했을 경우 메시지가 나타날 때 콘솔 화면이 상당히 많이 깜빡거리는걸 볼 수 있습니다. +단점은 래스터 글꼴을 기본으로 사용하면 아스키 인코딩을 하지 않는 문자를 잘못 나타낼 수 있습니다. 유니코드 파일 이름 뿐만 아니라 번역 메시지 조차 제대로 읽을 수 없습니다. 윈도우에서는 동아시아 지역으로 설정했을 경우 메시지가 나타날 때 콘솔 화면이 상당히 많이 깜빡거리는걸 볼 수 있습니다. .Sp ConEmu 콘솔에서는 utf8 인코딩이 제대로 동작합니다. .Sp @@ -224,6 +224,17 @@ ConEmu 콘솔에서는 utf8 인코딩이 제대로 동작합니다. .Sp 때로는 이진 파일을 텍스트 파일로 잘못 알아챌 수도 있습니다. \f(CW\*(C`\-s\*(C'\fR 옵션도 참고하십시오. .Sp +\&\f(CW\*(C`\-e\*(C'\fR 또는 \f(CW\*(C`\-\-add\-eol\*(C'\fR 옵션을 추가로 사용하면 행 마지막 개행 문자 형식도 출력하며, 없다면 \f(CW\*(C`noeol\*(C'\fR을 출력합니다. +.Sp +예제 출력: +.Sp +.Vb 4 +\& 6 0 0 no_bom text dos dos.txt +\& 0 6 0 no_bom text unix unix.txt +\& 0 0 6 no_bom text mac mac.txt +\& 1 0 0 no_bom text noeol noeol_dos.txt +.Ve +.Sp 출력 방식을 바꿀 추가 플래그를 설정할 수 있습니다. 플래그 하나 이상을 추가할 수 있습니다. .RS 4 .IP "\fB0\fR" 4 @@ -244,11 +255,16 @@ ConEmu 콘솔에서는 utf8 인코딩이 제대로 동작합니다. .IP "\fBt\fR" 4 .IX Item "t" 파일의 텍스트 또는 이진 여부를 출력합니다. +.IP "\fBe\fR" 4 +.IX Item "e" +행 마지막에 개행 문자 형식을 출력하거나, 없을 경우 \f(CW\*(C`noeol\*(C'\fR을 출력합니다. .IP "\fBc\fR" 4 .IX Item "c" 변환할 파일만 출력합니다. .Sp dos2unix에 \f(CW\*(C`c\*(C'\fR 플래그를 사용하면 \s-1DOS\s0 개행 문자가 들어간 파일만 출력합니다. unix2dos는 유닉스 개행 문자가 들어간 파일 이름만 출력합니다. +.Sp +\&\f(CW\*(C`\-e\*(C'\fR 또는 \f(CW\*(C`\-\-add\-eol\*(C'\fR 옵션을 추가로 사용하면 행 마지막에 빠진 개행 문자를 출력합니다. .IP "\fBh\fR" 4 .IX Item "h" 헤더를 출력합니다. @@ -290,6 +306,12 @@ dos2unix에 \f(CW\*(C`c\*(C'\fR 플래그를 사용하면 \s-1DOS\s0 개행 문 \& unix2dos \-ic *.txt .Ve .Sp +\&\s-1DOS\s0 개행 문자가 들어갔거나 행 마지막에 개행 문자가 빠진 파일 목록 출력: +.Sp +.Vb 1 +\& dos2unix \-e \-ic *.txt +.Ve +.Sp \&\s-1DOS\s0 개행 문자가 들어간 파일만 변환하며 다른 파일은 건드리지 않습니다: .Sp .Vb 1 @@ -410,7 +432,7 @@ UTF\-16LE가 \fI변환 모드\fR로 동작한다고 가정해보겠습니다. 버전 정보를 표시하고 나갑니다. .SH "맥 모드" .IX Header "맥 모드" -일반 모드에서는 개행 문자를 DOS에서 유닉스로 그 반대로 변환합니다. 맥 개행 문자는 변환하지 않습니다. +\&\s-1DOS\s0 개행 문자와 유닉스 개행 문자를 서로 변환해주는 동작이 기본 동작이빈다. 맥 개행 문자는 변환하지 않습니다. .PP 맥 모드에서 개행 문자를 맥에서 유닉스로, 내지는 그 반대로 변환합니다. \s-1DOS\s0 개행 문자를 바꾸지 않습니다. .PP @@ -419,12 +441,12 @@ UTF\-16LE가 \fI변환 모드\fR로 동작한다고 가정해보겠습니다. .IX Header "변환 모드" .IP "\fBascii\fR" 4 .IX Item "ascii" -\&\f(CW\*(C`ascii\*(C'\fR 모드에서는 개행 문자만 변환합니다. \s-1ASCII\s0 모드는 기본 변환 모드입니다. +기본 변환 모드입니다. 이 모드는 아스키와 UTF\-8과 같은 아스키 호환 인코딩 파일을 변환합니다. \fBascii\fR 모드를 활성화하면 \fB7bit\fR 모드와 \fBiso\fR 모드를 사용하지 않습니다. .Sp -7비트 표준 모드를 \s-1ASCII\s0 라고 칭하지만 실제 모드는 8 비트입니다. 유니코드 \s-1UTF\-8\s0 파일을 변환할 때 항상 이 모드를 사용하십시오. +dos2unix에서 UTF\-16을 지원하면 \s-1UTF\-16\s0 인코딩 파일을 \s-1POSIX\s0 시스템의 현재 로캘 문자 인코딩과 윈도우의 \s-1UTF\-8\s0 인코딩으로 변환합니다. \fBascii\fR 모드를 사용하면 \s-1UTF\-16\s0 인코딩 (\f(CW\*(C`u\*(C'\fR)을 유지하는 옵션과 \s-1UTF\-16\s0 입력(\f(CW\*(C`\-ul\*(C'\fR 및 \f(CW\*(C`\-ub\*(C'\fR)을 가정하는 옵션 값을 사용하지 않습니다. dos2unix에 \s-1UTF\-16\s0 을 지원하는지 알아보려면 \f(CW\*(C`dos2unix \-V\*(C'\fR를 입력하십시오. 유니코드 섹션도 살펴보십시오. .IP "\fB7bit\fR" 4 .IX Item "7bit" -이 모드에서는 \s-1ASCII\s0 영역 밖(128~255 값)의 모든 8비트 문자를 7비트 영역으로 변환합니다. +이 모드에서는 아스키 영역 밖(128~255 값)의 모든 8비트 문자를 7비트 영역으로 변환합니다. .IP "\fBiso\fR" 4 .IX Item "iso" \&\s-1DOS\s0 문자 세트(코드 페이지)에서 유닉스 \s-1ISO\s0 문자 세트 \s-1ISO\-8859\-1\s0(Latin1)로 또는 그 반대로 문자를 변환합니다. ISO\-8859\-1에 대응하지 않는 \s-1DOS\s0 문자는 변환할 수 없어 구두점으로 변환합니다. ISO\-8859\-1에서 \s-1DOS\s0 문자 세트로 변환할 때도 마찬가지입니다. @@ -491,9 +513,9 @@ dos2unix에 \f(CW\*(C`\-iso\*(C'\fR옵션만 사용했을 경우 활성 코드 여러가지 유니코드 인코딩이 있습니다. 유닉스와 리뉵스 유니코드 파일은 보통 \s-1UTF\-8\s0 인코딩 방식으로 인코딩합니다. 윈도우에서는 유니코드 텍스트 파일을 \s-1UTF\-8, UTF\-16, UTF\-16\s0 빅엔디언 방식으로 인코딩할 수 있지만 보통 \s-1UTF\-16\s0 형식으로 인코딩합니다. .SS "변환" .IX Subsection "변환" -유니코드 텍스트 파일에는 \s-1DOS,\s0 유닉스, 맥 개행 문자를 일반 텍스트 파일처럼 가질 수 있습니다. +유니코드 텍스트 파일에는 \s-1DOS,\s0 유닉스, 맥 개행 문자를 아스키 텍스트 파일처럼 가질 수 있습니다. .PP -dos2unix와 unix2dos의 모든 버전에서는 UTF\-8이 ASCII와의 하위 호환성을 고려했기 때문에 \s-1UTF\-8\s0 인코딩 파일을 변환할 수 있습니다. +dos2unix와 unix2dos의 모든 버전에서는 UTF\-8이 아스키와의 하위 호환성을 고려했기 때문에 \s-1UTF\-8\s0 인코딩 파일을 변환할 수 있습니다. .PP UTF\-16을 지원하는 dos2unix와 unix2dos는 \s-1UTF\-16\s0 리틀엔디언 및 빅엔디언 인코딩 텍스트 파일을 모두 읽을 수 있습니다. dos2unix에 \s-1UTF\-16\s0 지원 기능이 들어갔는지 확인하려면 \f(CW\*(C`dos2unix \-V\*(C'\fR 명령을 입력하십시오. .PP @@ -510,7 +532,7 @@ dos2unix와 unix2dos에는 \s-1UTF\-8\s0 파일을 UTF\-16으로 변환하는 \&\s-1ISO\s0 및 7비트 모드 변환은 \s-1UTF\-16\s0 파일에 동작하지 않습니다. .SS "바이트 순서 표시(\s-1BOM\s0)" .IX Subsection "바이트 순서 표시(BOM)" -윈도우에서는 유니코드 텍스트 파일에 대부분 윈도우 프로그램(메모장 포함)에서 BOM을 기본으로 추가하기 때문에 보통 바이트 순서 표시(\s-1BOM\s0)가 들어갑니다. 링크를 참고하십시오. +윈도우에서는 유니코드 텍스트 파일에 대부분 윈도우 프로그램(메모장 포함)에서 BOM을 기본으로 추가하기 때문에 보통 바이트 순서 표시(\s-1BOM\s0)가 들어갑니다. 링크를 참고하십시오. .PP 유닉스에서는 유니코드 파일에 BOM이 들어가지 않습니다. 텍스트 파일을 로캘 문자 인코딩으로 인코딩했다고 가정합니다. .PP @@ -555,9 +577,9 @@ dos2unix에서는 윈도우 명령 프롬프트의 유니코드 파일 이름을 .Ve .SH "GB18030" .IX Header "GB18030" -GB18030은 중화인민공화국 정부 표준입니다. \s-1GB18030\s0 표준 하위 필수 세트는 중화인민공화국에서 판매하는 모든 프로그램 제품에 공식적으로 필요합니다. 링크를 참고하십시오. +GB18030은 중화인민공화국 정부 표준입니다. \s-1GB18030\s0 표준 하위 필수 세트는 중화인민공화국에서 판매하는 모든 프로그램 제품에 공식적으로 필요합니다. 링크를 참고하십시오. .PP -GB18030은 유니코드와 완벽하게 호환하며, 유니코드 변환 형식으로 고려할 수 있습니다. UTF\-8과 유사하게, GB18030은 ASCII와 호환성을 지닙니다. GB18030은 또한 GBK로 알려진 윈도우 코드 페이지 936과도 호환성이 있습니다. +GB18030은 유니코드와 완벽하게 호환하며, 유니코드 변환 형식으로 고려할 수 있습니다. UTF\-8과 유사하게, GB18030은 아스키와 호환성을 지닙니다. GB18030은 또한 GBK로 알려진 윈도우 코드 페이지 936과도 호환성이 있습니다. .PP 유닉스/리눅스에서 \s-1UTF\-16\s0 파일은 로캘 인코딩을 GB18030으로 설정하면 GB18030으로 변환합니다. 참고로 시스템에서 해당 로캘을 지원할 경우에만 동작합니다. 지원 로캘 목록을 살펴보려면 \f(CW\*(C`locale \-a\*(C'\fR 명령을 사용하십시오. .PP @@ -680,12 +702,12 @@ a.txt를 변환하여 e.txt로 기록, a.txt를 변환하고 내용 바꾸기, b \& export LANG=en_GB.UTF\-8 English, UK, UTF\-8 encoding .Ve .Sp -언어 및 국가 코드 전체 목록을 보려면 gettext 설명서를 참고하십시오 +언어 및 국가 코드 전체 목록을 보려면 gettext 설명서를 참고하십시오 .Sp 유닉스 시스템에서는 \fBlocale\fR\|(1) 명령을 활용하여 로캘별 정보를 가져올 수 있습니다. .IP "\fB\s-1LANGUAGE\s0\fR" 4 .IX Item "LANGUAGE" -\&\s-1LANGUAGE\s0 환경 변수에는 언어를 우선 순위별로 콜론으로 구분하여 지정할 수 있습니다. dos2unix에서는 LANGUAGE를 LANG보다 우선하여 취급합니다. 예를 들면 네덜란드어를 먼저 그 다음에 독일어를 설정할 경우 \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR(으)로 설정합니다. \s-1LANGUAGE\s0 환경 변수에 언어별 우선 순위를 두어 사용할 수 있기 전에 \s-1LANG\s0 환경 변수에 \*(L"C\*(R" 대신 다른 값을 넣어 지역화를 우선 설정해야합니다. gettext 설명서를 참고하십시오 +\&\s-1LANGUAGE\s0 환경 변수에는 언어를 우선 순위별로 콜론으로 구분하여 지정할 수 있습니다. dos2unix에서는 LANGUAGE를 LANG보다 우선하여 취급합니다. 예를 들면 네덜란드어를 먼저 그 다음에 독일어를 설정할 경우 \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR(으)로 설정합니다. \s-1LANGUAGE\s0 환경 변수에 언어별 우선 순위를 두어 사용할 수 있기 전에 \s-1LANG\s0 환경 변수에 \*(L"C\*(R" 대신 다른 값을 넣어 지역화를 우선 설정해야합니다. gettext 설명서를 참고하십시오 .Sp 사용할 수 없는 언어를 선택했다면 표준 (국제) 영어 메시지로 나타납니다. .IP "\fB\s-1DOS2UNIX_LOCALEDIR\s0\fR" 4 @@ -704,20 +726,20 @@ a.txt를 변환하여 e.txt로 기록, a.txt를 변환하고 내용 바꾸기, b 미출력 모드의 반환 값은 항상 0이지만, 명령행 옵션이 잘못됐을 경우는 제외합니다. .SH "표준" .IX Header "표준" - + .PP - + .PP - + .PP - + .SH "저자" .IX Header "저자" Benjamin Lin \- , Bernd Johannes Wuebben (mac2unix mode) \- , Christian Wurll (add extra newline) \- , Erwin Waterlander \- (maintainer) .PP -프로젝트 페이지: +프로젝트 페이지: .PP -SourceForge 페이지: +SourceForge 페이지: .SH "추가 참조" .IX Header "추가 참조" \&\fBfile\fR\|(1) \fBfind\fR\|(1) \fBiconv\fR\|(1) \fBlocale\fR\|(1) \fBxargs\fR\|(1) diff --git a/dos2unix/man/ko/man1/dos2unix.htm b/dos2unix/man/ko/man1/dos2unix.htm index d402c6a..2443f38 100644 --- a/dos2unix/man/ko/man1/dos2unix.htm +++ b/dos2unix/man/ko/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.5.1 - DOS/맥 에서 유닉스에서, 그 반대로의 텍스트 파일 형식 변환 프로그램 +dos2unix 7.5.2 - DOS/맥 에서 유닉스에서, 그 반대로의 텍스트 파일 형식 변환 프로그램 @@ -89,7 +89,7 @@

옵션

-ascii
-

줄 바꿈 문자만 변환합니다. 기본 변환 모드입니다.

+

기본 변환 모드입니다. 변환 모드 섹션을 참고하십시오.

-iso
@@ -178,7 +178,7 @@

옵션

ConEmu 콘솔을 사용한다면 ConEmu에서 적절한 글꼴을 자동으로 선택하므로 모든 텍스트가 제대로 나타납니다.

-

유니코드 사용의 단점은 ASCII와 호환성이 없다는 점입니다. 다른 프로그램으로 출력을 전달할 때 쉽게 처리할 수 없습니다.

+

유니코드 사용의 단점은 아스키와 호환성이 없다는 점입니다. 다른 프로그램으로 출력을 전달할 때 쉽게 처리할 수 없습니다.

unicodebom 방식을 사용하면 BOM(바이트 순서 표시)을 텍스트 앞에 둡니다. BOM은 파워셸에서 출력 내용을 올바르게 전달 또는 파이핑할 때 필요합니다.

@@ -186,9 +186,9 @@

옵션

utf8, utf8bom
-

utf8의 장점은 ASCII와의 호환성입니다. 콘솔의 글꼴을 트루타입 글꼴로 선택해야 합니다. 트루타입 글꼴로 설정하면 unicode 인코딩 때와 비슷하게 나타납니다.

+

utf8의 장점은 아스키와의 호환성입니다. 콘솔의 글꼴을 트루타입 글꼴로 선택해야 합니다. 트루타입 글꼴로 설정하면 unicode 인코딩 때와 비슷하게 나타납니다.

-

단점은 래스터 글꼴을 기본으로 사용하면 ASCII 인코딩 하지 않는 문자를 잘못 나타낼 수 있습니다. 유니코드 파일 이름 뿐만 아니라 번역 메시지 조차 제대로 읽을 수 없습니다. 윈도우에서는 동아시아 지역으로 설정했을 경우 메시지가 나타날 때 콘솔 화면이 상당히 많이 깜빡거리는걸 볼 수 있습니다.

+

단점은 래스터 글꼴을 기본으로 사용하면 아스키 인코딩을 하지 않는 문자를 잘못 나타낼 수 있습니다. 유니코드 파일 이름 뿐만 아니라 번역 메시지 조차 제대로 읽을 수 없습니다. 윈도우에서는 동아시아 지역으로 설정했을 경우 메시지가 나타날 때 콘솔 화면이 상당히 많이 깜빡거리는걸 볼 수 있습니다.

ConEmu 콘솔에서는 utf8 인코딩이 제대로 동작합니다.

@@ -246,6 +246,15 @@

옵션

때로는 이진 파일을 텍스트 파일로 잘못 알아챌 수도 있습니다. -s 옵션도 참고하십시오.

+

-e 또는 --add-eol 옵션을 추가로 사용하면 행 마지막 개행 문자 형식도 출력하며, 없다면 noeol을 출력합니다.

+ +

예제 출력:

+ +
6       0       0  no_bom    text   dos     dos.txt
+0       6       0  no_bom    text   unix    unix.txt
+0       0       6  no_bom    text   mac     mac.txt
+1       0       0  no_bom    text   noeol   noeol_dos.txt
+

출력 방식을 바꿀 추가 플래그를 설정할 수 있습니다. 플래그 하나 이상을 추가할 수 있습니다.

@@ -285,6 +294,12 @@

옵션

파일의 텍스트 또는 이진 여부를 출력합니다.

+
+
e
+
+ +

행 마지막에 개행 문자 형식을 출력하거나, 없을 경우 noeol을 출력합니다.

+
c
@@ -293,6 +308,8 @@

옵션

dos2unix에 c 플래그를 사용하면 DOS 개행 문자가 들어간 파일만 출력합니다. unix2dos는 유닉스 개행 문자가 들어간 파일 이름만 출력합니다.

+

-e 또는 --add-eol 옵션을 추가로 사용하면 행 마지막에 빠진 개행 문자를 출력합니다.

+
h
@@ -330,6 +347,10 @@

옵션

unix2dos -ic *.txt
+

DOS 개행 문자가 들어갔거나 행 마지막에 개행 문자가 빠진 파일 목록 출력:

+ +
dos2unix -e -ic *.txt
+

DOS 개행 문자가 들어간 파일만 변환하며 다른 파일은 건드리지 않습니다:

dos2unix -ic0 *.txt | xargs -0 dos2unix
@@ -503,7 +524,7 @@

옵션

맥 모드

-

일반 모드에서는 개행 문자를 DOS에서 유닉스로 그 반대로 변환합니다. 맥 개행 문자는 변환하지 않습니다.

+

DOS 개행 문자와 유닉스 개행 문자를 서로 변환해주는 동작이 기본 동작이빈다. 맥 개행 문자는 변환하지 않습니다.

맥 모드에서 개행 문자를 맥에서 유닉스로, 내지는 그 반대로 변환합니다. DOS 개행 문자를 바꾸지 않습니다.

@@ -516,15 +537,15 @@

변환 모드

ascii
-

ascii 모드에서는 개행 문자만 변환합니다. ASCII 모드는 기본 변환 모드입니다.

+

기본 변환 모드입니다. 이 모드는 아스키와 UTF-8과 같은 아스키 호환 인코딩 파일을 변환합니다. ascii 모드를 활성화하면 7bit 모드와 iso 모드를 사용하지 않습니다.

-

7비트 표준 모드를 ASCII 라고 칭하지만 실제 모드는 8 비트입니다. 유니코드 UTF-8 파일을 변환할 때 항상 이 모드를 사용하십시오.

+

dos2unix에서 UTF-16을 지원하면 UTF-16 인코딩 파일을 POSIX 시스템의 현재 로캘 문자 인코딩과 윈도우의 UTF-8 인코딩으로 변환합니다. ascii 모드를 사용하면 UTF-16 인코딩 (u)을 유지하는 옵션과 UTF-16 입력(-ul 및 -ub)을 가정하는 옵션 값을 사용하지 않습니다. dos2unix에 UTF-16 을 지원하는지 알아보려면 dos2unix -V를 입력하십시오. 유니코드 섹션도 살펴보십시오.

7bit
-

이 모드에서는 ASCII 영역 밖(128~255 값)의 모든 8비트 문자를 7비트 영역으로 변환합니다.

+

이 모드에서는 아스키 영역 밖(128~255 값)의 모든 8비트 문자를 7비트 영역으로 변환합니다.

iso
@@ -583,9 +604,9 @@

인코딩

변환

-

유니코드 텍스트 파일에는 DOS, 유닉스, 맥 개행 문자를 일반 텍스트 파일처럼 가질 수 있습니다.

+

유니코드 텍스트 파일에는 DOS, 유닉스, 맥 개행 문자를 아스키 텍스트 파일처럼 가질 수 있습니다.

-

dos2unix와 unix2dos의 모든 버전에서는 UTF-8이 ASCII와의 하위 호환성을 고려했기 때문에 UTF-8 인코딩 파일을 변환할 수 있습니다.

+

dos2unix와 unix2dos의 모든 버전에서는 UTF-8이 아스키와의 하위 호환성을 고려했기 때문에 UTF-8 인코딩 파일을 변환할 수 있습니다.

UTF-16을 지원하는 dos2unix와 unix2dos는 UTF-16 리틀엔디언 및 빅엔디언 인코딩 텍스트 파일을 모두 읽을 수 있습니다. dos2unix에 UTF-16 지원 기능이 들어갔는지 확인하려면 dos2unix -V 명령을 입력하십시오.

@@ -603,7 +624,7 @@

변환

바이트 순서 표시(BOM)

-

윈도우에서는 유니코드 텍스트 파일에 대부분 윈도우 프로그램(메모장 포함)에서 BOM을 기본으로 추가하기 때문에 보통 바이트 순서 표시(BOM)가 들어갑니다. http://en.wikipedia.org/wiki/Byte_order_mark 링크를 참고하십시오.

+

윈도우에서는 유니코드 텍스트 파일에 대부분 윈도우 프로그램(메모장 포함)에서 BOM을 기본으로 추가하기 때문에 보통 바이트 순서 표시(BOM)가 들어갑니다. https://en.wikipedia.org/wiki/Byte_order_mark 링크를 참고하십시오.

유닉스에서는 유니코드 파일에 BOM이 들어가지 않습니다. 텍스트 파일을 로캘 문자 인코딩으로 인코딩했다고 가정합니다.

@@ -643,9 +664,9 @@

유니코드 예제

GB18030

-

GB18030은 중화인민공화국 정부 표준입니다. GB18030 표준 하위 필수 세트는 중화인민공화국에서 판매하는 모든 프로그램 제품에 공식적으로 필요합니다. http://en.wikipedia.org/wiki/GB_18030 링크를 참고하십시오.

+

GB18030은 중화인민공화국 정부 표준입니다. GB18030 표준 하위 필수 세트는 중화인민공화국에서 판매하는 모든 프로그램 제품에 공식적으로 필요합니다. https://en.wikipedia.org/wiki/GB_18030 링크를 참고하십시오.

-

GB18030은 유니코드와 완벽하게 호환하며, 유니코드 변환 형식으로 고려할 수 있습니다. UTF-8과 유사하게, GB18030은 ASCII와 호환성을 지닙니다. GB18030은 또한 GBK로 알려진 윈도우 코드 페이지 936과도 호환성이 있습니다.

+

GB18030은 유니코드와 완벽하게 호환하며, 유니코드 변환 형식으로 고려할 수 있습니다. UTF-8과 유사하게, GB18030은 아스키와 호환성을 지닙니다. GB18030은 또한 GBK로 알려진 윈도우 코드 페이지 936과도 호환성이 있습니다.

유닉스/리눅스에서 UTF-16 파일은 로캘 인코딩을 GB18030으로 설정하면 GB18030으로 변환합니다. 참고로 시스템에서 해당 로캘을 지원할 경우에만 동작합니다. 지원 로캘 목록을 살펴보려면 locale -a 명령을 사용하십시오.

@@ -742,7 +763,7 @@

지역화

export LANG=en_US.iso88591 English, USA, Latin-1 encoding export LANG=en_GB.UTF-8 English, UK, UTF-8 encoding -

언어 및 국가 코드 전체 목록을 보려면 http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html gettext 설명서를 참고하십시오

+

언어 및 국가 코드 전체 목록을 보려면 https://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html gettext 설명서를 참고하십시오

유닉스 시스템에서는 locale(1) 명령을 활용하여 로캘별 정보를 가져올 수 있습니다.

@@ -750,7 +771,7 @@

지역화

LANGUAGE
-

LANGUAGE 환경 변수에는 언어를 우선 순위별로 콜론으로 구분하여 지정할 수 있습니다. dos2unix에서는 LANGUAGE를 LANG보다 우선하여 취급합니다. 예를 들면 네덜란드어를 먼저 그 다음에 독일어를 설정할 경우 LANGUAGE=nl:de(으)로 설정합니다. LANGUAGE 환경 변수에 언어별 우선 순위를 두어 사용할 수 있기 전에 LANG 환경 변수에 "C" 대신 다른 값을 넣어 지역화를 우선 설정해야합니다. http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html gettext 설명서를 참고하십시오

+

LANGUAGE 환경 변수에는 언어를 우선 순위별로 콜론으로 구분하여 지정할 수 있습니다. dos2unix에서는 LANGUAGE를 LANG보다 우선하여 취급합니다. 예를 들면 네덜란드어를 먼저 그 다음에 독일어를 설정할 경우 LANGUAGE=nl:de(으)로 설정합니다. LANGUAGE 환경 변수에 언어별 우선 순위를 두어 사용할 수 있기 전에 LANG 환경 변수에 "C" 대신 다른 값을 넣어 지역화를 우선 설정해야합니다. https://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html gettext 설명서를 참고하십시오

사용할 수 없는 언어를 선택했다면 표준 (국제) 영어 메시지로 나타납니다.

@@ -775,21 +796,21 @@

반환 값

표준

-

http://en.wikipedia.org/wiki/Text_file

+

https://en.wikipedia.org/wiki/Text_file

-

http://en.wikipedia.org/wiki/Carriage_return

+

https://en.wikipedia.org/wiki/Carriage_return

-

http://en.wikipedia.org/wiki/Newline

+

https://en.wikipedia.org/wiki/Newline

-

http://en.wikipedia.org/wiki/Unicode

+

https://en.wikipedia.org/wiki/Unicode

저자

Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)

-

프로젝트 페이지: http://waterlan.home.xs4all.nl/dos2unix.html

+

프로젝트 페이지: https://waterlan.home.xs4all.nl/dos2unix.html

-

SourceForge 페이지: http://sourceforge.net/projects/dos2unix/

+

SourceForge 페이지: https://sourceforge.net/projects/dos2unix/

추가 참조

diff --git a/dos2unix/man/ko/man1/dos2unix.pod b/dos2unix/man/ko/man1/dos2unix.pod index b472b8c..86cca45 100644 --- a/dos2unix/man/ko/man1/dos2unix.pod +++ b/dos2unix/man/ko/man1/dos2unix.pod @@ -63,7 +63,7 @@ dos2unix는 SunOS/솔라리스의 dos2unix가 나온 후 구성한 모델입니 =item B<-ascii> -줄 바꿈 문자만 변환합니다. 기본 변환 모드입니다. +기본 변환 모드입니다. 변환 모드 섹션을 참고하십시오. =item B<-iso> @@ -129,7 +129,7 @@ ANSI 방식의 단점은 국제어 파일 이름이 시스템 기본 코드 페 ConEmu 콘솔을 사용한다면 ConEmu에서 적절한 글꼴을 자동으로 선택하므로 모든 텍스트가 제대로 나타납니다. -유니코드 사용의 단점은 ASCII와 호환성이 없다는 점입니다. 다른 프로그램으로 출력을 전달할 때 쉽게 처리할 수 없습니다. +유니코드 사용의 단점은 아스키와 호환성이 없다는 점입니다. 다른 프로그램으로 출력을 전달할 때 쉽게 처리할 수 없습니다. C 방식을 사용하면 BOM(바이트 순서 표시)을 텍스트 앞에 둡니다. BOM은 파워셸에서 출력 내용을 올바르게 전달 또는 파이핑할 때 필요합니다. @@ -137,9 +137,9 @@ C 방식을 사용하면 BOM(바이트 순서 표시)을 텍스트 =item B -utf8의 장점은 ASCII와의 호환성입니다. 콘솔의 글꼴을 트루타입 글꼴로 선택해야 합니다. 트루타입 글꼴로 설정하면 C 인코딩 때와 비슷하게 나타납니다. +utf8의 장점은 아스키와의 호환성입니다. 콘솔의 글꼴을 트루타입 글꼴로 선택해야 합니다. 트루타입 글꼴로 설정하면 C 인코딩 때와 비슷하게 나타납니다. -단점은 래스터 글꼴을 기본으로 사용하면 ASCII 인코딩 하지 않는 문자를 잘못 나타낼 수 있습니다. 유니코드 파일 이름 뿐만 아니라 번역 메시지 조차 제대로 읽을 수 없습니다. 윈도우에서는 동아시아 지역으로 설정했을 경우 메시지가 나타날 때 콘솔 화면이 상당히 많이 깜빡거리는걸 볼 수 있습니다. +단점은 래스터 글꼴을 기본으로 사용하면 아스키 인코딩을 하지 않는 문자를 잘못 나타낼 수 있습니다. 유니코드 파일 이름 뿐만 아니라 번역 메시지 조차 제대로 읽을 수 없습니다. 윈도우에서는 동아시아 지역으로 설정했을 경우 메시지가 나타날 때 콘솔 화면이 상당히 많이 깜빡거리는걸 볼 수 있습니다. ConEmu 콘솔에서는 utf8 인코딩이 제대로 동작합니다. @@ -188,6 +188,15 @@ DOS 형식에서 유닉스 형식으로 변환한 파일의 행 끝에 개행 때로는 이진 파일을 텍스트 파일로 잘못 알아챌 수도 있습니다. C<-s> 옵션도 참고하십시오. +C<-e> 또는 C<--add-eol> 옵션을 추가로 사용하면 행 마지막 개행 문자 형식도 출력하며, 없다면 C을 출력합니다. + +예제 출력: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + 출력 방식을 바꿀 추가 플래그를 설정할 수 있습니다. 플래그 하나 이상을 추가할 수 있습니다. =over 4 @@ -216,12 +225,18 @@ DOS 개행 문자를 출력합니다. 파일의 텍스트 또는 이진 여부를 출력합니다. +=item B + +행 마지막에 개행 문자 형식을 출력하거나, 없을 경우 C을 출력합니다. + =item B 변환할 파일만 출력합니다. dos2unix에 C 플래그를 사용하면 DOS 개행 문자가 들어간 파일만 출력합니다. unix2dos는 유닉스 개행 문자가 들어간 파일 이름만 출력합니다. +C<-e> 또는 C<--add-eol> 옵션을 추가로 사용하면 행 마지막에 빠진 개행 문자를 출력합니다. + =item B 헤더를 출력합니다. @@ -254,6 +269,10 @@ DOS 개행 문자가 들어간 파일 목록 출력: unix2dos -ic *.txt +DOS 개행 문자가 들어갔거나 행 마지막에 개행 문자가 빠진 파일 목록 출력: + + dos2unix -e -ic *.txt + DOS 개행 문자가 들어간 파일만 변환하며 다른 파일은 건드리지 않습니다: dos2unix -ic0 *.txt | xargs -0 dos2unix @@ -388,7 +407,7 @@ UTF-16LE가 I<변환 모드>로 동작한다고 가정해보겠습니다. 기본 =head1 맥 모드 -일반 모드에서는 개행 문자를 DOS에서 유닉스로 그 반대로 변환합니다. 맥 개행 문자는 변환하지 않습니다. +DOS 개행 문자와 유닉스 개행 문자를 서로 변환해주는 동작이 기본 동작이빈다. 맥 개행 문자는 변환하지 않습니다. 맥 모드에서 개행 문자를 맥에서 유닉스로, 내지는 그 반대로 변환합니다. DOS 개행 문자를 바꾸지 않습니다. @@ -400,13 +419,13 @@ UTF-16LE가 I<변환 모드>로 동작한다고 가정해보겠습니다. 기본 =item B -C 모드에서는 개행 문자만 변환합니다. ASCII 모드는 기본 변환 모드입니다. +기본 변환 모드입니다. 이 모드는 아스키와 UTF-8과 같은 아스키 호환 인코딩 파일을 변환합니다. B 모드를 활성화하면 B<7bit> 모드와 B 모드를 사용하지 않습니다. -7비트 표준 모드를 ASCII 라고 칭하지만 실제 모드는 8 비트입니다. 유니코드 UTF-8 파일을 변환할 때 항상 이 모드를 사용하십시오. +dos2unix에서 UTF-16을 지원하면 UTF-16 인코딩 파일을 POSIX 시스템의 현재 로캘 문자 인코딩과 윈도우의 UTF-8 인코딩으로 변환합니다. B 모드를 사용하면 UTF-16 인코딩 (C)을 유지하는 옵션과 UTF-16 입력(C<-ul> 및 C<-ub>)을 가정하는 옵션 값을 사용하지 않습니다. dos2unix에 UTF-16 을 지원하는지 알아보려면 C를 입력하십시오. 유니코드 섹션도 살펴보십시오. =item B<7bit> -이 모드에서는 ASCII 영역 밖(128~255 값)의 모든 8비트 문자를 7비트 영역으로 변환합니다. +이 모드에서는 아스키 영역 밖(128~255 값)의 모든 8비트 문자를 7비트 영역으로 변환합니다. =item B @@ -462,9 +481,9 @@ L 링크와 L 명령을 입력하십시오. @@ -482,7 +501,7 @@ ISO 및 7비트 모드 변환은 UTF-16 파일에 동작하지 않습니다. =head2 바이트 순서 표시(BOM) -윈도우에서는 유니코드 텍스트 파일에 대부분 윈도우 프로그램(메모장 포함)에서 BOM을 기본으로 추가하기 때문에 보통 바이트 순서 표시(BOM)가 들어갑니다. L 링크를 참고하십시오. +윈도우에서는 유니코드 텍스트 파일에 대부분 윈도우 프로그램(메모장 포함)에서 BOM을 기본으로 추가하기 때문에 보통 바이트 순서 표시(BOM)가 들어갑니다. L 링크를 참고하십시오. 유닉스에서는 유니코드 파일에 BOM이 들어가지 않습니다. 텍스트 파일을 로캘 문자 인코딩으로 인코딩했다고 가정합니다. @@ -522,9 +541,9 @@ dos2unix에서는 윈도우 명령 프롬프트의 유니코드 파일 이름을 =head1 GB18030 -GB18030은 중화인민공화국 정부 표준입니다. GB18030 표준 하위 필수 세트는 중화인민공화국에서 판매하는 모든 프로그램 제품에 공식적으로 필요합니다. L 링크를 참고하십시오. +GB18030은 중화인민공화국 정부 표준입니다. GB18030 표준 하위 필수 세트는 중화인민공화국에서 판매하는 모든 프로그램 제품에 공식적으로 필요합니다. L 링크를 참고하십시오. -GB18030은 유니코드와 완벽하게 호환하며, 유니코드 변환 형식으로 고려할 수 있습니다. UTF-8과 유사하게, GB18030은 ASCII와 호환성을 지닙니다. GB18030은 또한 GBK로 알려진 윈도우 코드 페이지 936과도 호환성이 있습니다. +GB18030은 유니코드와 완벽하게 호환하며, 유니코드 변환 형식으로 고려할 수 있습니다. UTF-8과 유사하게, GB18030은 아스키와 호환성을 지닙니다. GB18030은 또한 GBK로 알려진 윈도우 코드 페이지 936과도 호환성이 있습니다. 유닉스/리눅스에서 UTF-16 파일은 로캘 인코딩을 GB18030으로 설정하면 GB18030으로 변환합니다. 참고로 시스템에서 해당 로캘을 지원할 경우에만 동작합니다. 지원 로캘 목록을 살펴보려면 C 명령을 사용하십시오. @@ -622,13 +641,13 @@ find(1) 명령의 옵션 C<-print0> 그리고 이에 해당하는 xargs(1) 명 export LANG=en_US.iso88591 English, USA, Latin-1 encoding export LANG=en_GB.UTF-8 English, UK, UTF-8 encoding -언어 및 국가 코드 전체 목록을 보려면 L gettext 설명서를 참고하십시오 +언어 및 국가 코드 전체 목록을 보려면 L gettext 설명서를 참고하십시오 유닉스 시스템에서는 locale(1) 명령을 활용하여 로캘별 정보를 가져올 수 있습니다. =item B -LANGUAGE 환경 변수에는 언어를 우선 순위별로 콜론으로 구분하여 지정할 수 있습니다. dos2unix에서는 LANGUAGE를 LANG보다 우선하여 취급합니다. 예를 들면 네덜란드어를 먼저 그 다음에 독일어를 설정할 경우 C(으)로 설정합니다. LANGUAGE 환경 변수에 언어별 우선 순위를 두어 사용할 수 있기 전에 LANG 환경 변수에 "C" 대신 다른 값을 넣어 지역화를 우선 설정해야합니다. L gettext 설명서를 참고하십시오 +LANGUAGE 환경 변수에는 언어를 우선 순위별로 콜론으로 구분하여 지정할 수 있습니다. dos2unix에서는 LANGUAGE를 LANG보다 우선하여 취급합니다. 예를 들면 네덜란드어를 먼저 그 다음에 독일어를 설정할 경우 C(으)로 설정합니다. LANGUAGE 환경 변수에 언어별 우선 순위를 두어 사용할 수 있기 전에 LANG 환경 변수에 "C" 대신 다른 값을 넣어 지역화를 우선 설정해야합니다. L gettext 설명서를 참고하십시오 사용할 수 없는 언어를 선택했다면 표준 (국제) 영어 메시지로 나타납니다. @@ -654,21 +673,21 @@ DOS2UNIX_LOCALEDIR 환경 변수는, 컴파일 시간에는 LOCALEDIR 환경 변 =head1 표준 -L +L -L +L -L +L -L +L =head1 저자 Benjamin Lin - , Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer) -프로젝트 페이지: L +프로젝트 페이지: L -SourceForge 페이지: L +SourceForge 페이지: L =head1 추가 참조 diff --git a/dos2unix/man/ko/man1/dos2unix.txt b/dos2unix/man/ko/man1/dos2unix.txt index 817604d..cb27e24 100644 --- a/dos2unix/man/ko/man1/dos2unix.txt +++ b/dos2unix/man/ko/man1/dos2unix.txt @@ -47,7 +47,7 @@ 이 옵션은 dos2unix에서 파일의 사용자 및 그룹 소유권을 유지하는 기능이 있을 경우에만 사용할 수 있습니다. -ascii - 줄 바꿈 문자만 변환합니다. 기본 변환 모드입니다. + 기본 변환 모드입니다. 변환 모드 섹션을 참고하십시오. -iso DOS와 ISO-8859-1 문자 세트 변환을 진행합니다. 변환 모드 섹션을 참고하십시오. @@ -106,17 +106,17 @@ ConEmu 콘솔을 사용한다면 ConEmu에서 적절한 글꼴을 자동으로 선택하므로 모든 텍스트가 제대로 나타납니다. - 유니코드 사용의 단점은 ASCII와 호환성이 없다는 점입니다. 다른 프로그램으로 출력을 전달할 때 쉽게 처리할 수 + 유니코드 사용의 단점은 아스키와 호환성이 없다는 점입니다. 다른 프로그램으로 출력을 전달할 때 쉽게 처리할 수 없습니다. "unicodebom" 방식을 사용하면 BOM(바이트 순서 표시)을 텍스트 앞에 둡니다. BOM은 파워셸에서 출력 내용을 올바르게 전달 또는 파이핑할 때 필요합니다. utf8, utf8bom - utf8의 장점은 ASCII와의 호환성입니다. 콘솔의 글꼴을 트루타입 글꼴로 선택해야 합니다. 트루타입 글꼴로 - 설정하면 "unicode" 인코딩 때와 비슷하게 나타납니다. + utf8의 장점은 아스키와의 호환성입니다. 콘솔의 글꼴을 트루타입 글꼴로 선택해야 합니다. 트루타입 글꼴로 설정하면 + "unicode" 인코딩 때와 비슷하게 나타납니다. - 단점은 래스터 글꼴을 기본으로 사용하면 ASCII 인코딩 하지 않는 문자를 잘못 나타낼 수 있습니다. 유니코드 파일 + 단점은 래스터 글꼴을 기본으로 사용하면 아스키 인코딩을 하지 않는 문자를 잘못 나타낼 수 있습니다. 유니코드 파일 이름 뿐만 아니라 번역 메시지 조차 제대로 읽을 수 없습니다. 윈도우에서는 동아시아 지역으로 설정했을 경우 메시지가 나타날 때 콘솔 화면이 상당히 많이 깜빡거리는걸 볼 수 있습니다. @@ -166,6 +166,16 @@ 때로는 이진 파일을 텍스트 파일로 잘못 알아챌 수도 있습니다. "-s" 옵션도 참고하십시오. + "-e" 또는 "--add-eol" 옵션을 추가로 사용하면 행 마지막 개행 문자 형식도 출력하며, 없다면 "noeol"을 + 출력합니다. + + 예제 출력: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + 출력 방식을 바꿀 추가 플래그를 설정할 수 있습니다. 플래그 하나 이상을 추가할 수 있습니다. 0 파일 정보 행 끝의 개행 문자 대신 널 문자를 출력합니다. c 플래그를 사용할 때 공백 또는 따옴표로 파일 이름 @@ -181,11 +191,15 @@ t 파일의 텍스트 또는 이진 여부를 출력합니다. + e 행 마지막에 개행 문자 형식을 출력하거나, 없을 경우 "noeol"을 출력합니다. + c 변환할 파일만 출력합니다. dos2unix에 "c" 플래그를 사용하면 DOS 개행 문자가 들어간 파일만 출력합니다. unix2dos는 유닉스 개행 문자가 들어간 파일 이름만 출력합니다. + "-e" 또는 "--add-eol" 옵션을 추가로 사용하면 행 마지막에 빠진 개행 문자를 출력합니다. + h 헤더를 출력합니다. p 경로를 뺀 파일 이름을 나타냅니다. @@ -212,6 +226,10 @@ unix2dos -ic *.txt + DOS 개행 문자가 들어갔거나 행 마지막에 개행 문자가 빠진 파일 목록 출력: + + dos2unix -e -ic *.txt + DOS 개행 문자가 들어간 파일만 변환하며 다른 파일은 건드리지 않습니다: dos2unix -ic0 *.txt | xargs -0 dos2unix @@ -348,7 +366,7 @@ 버전 정보를 표시하고 나갑니다. 맥 모드 - 일반 모드에서는 개행 문자를 DOS에서 유닉스로 그 반대로 변환합니다. 맥 개행 문자는 변환하지 않습니다. + DOS 개행 문자와 유닉스 개행 문자를 서로 변환해주는 동작이 기본 동작이빈다. 맥 개행 문자는 변환하지 않습니다. 맥 모드에서 개행 문자를 맥에서 유닉스로, 내지는 그 반대로 변환합니다. DOS 개행 문자를 바꾸지 않습니다. @@ -357,13 +375,16 @@ 변환 모드 ascii - "ascii" 모드에서는 개행 문자만 변환합니다. ASCII 모드는 기본 변환 모드입니다. + 기본 변환 모드입니다. 이 모드는 아스키와 UTF-8과 같은 아스키 호환 인코딩 파일을 변환합니다. ascii 모드를 + 활성화하면 7bit 모드와 iso 모드를 사용하지 않습니다. - 7비트 표준 모드를 ASCII 라고 칭하지만 실제 모드는 8 비트입니다. 유니코드 UTF-8 파일을 변환할 때 항상 이 - 모드를 사용하십시오. + dos2unix에서 UTF-16을 지원하면 UTF-16 인코딩 파일을 POSIX 시스템의 현재 로캘 문자 인코딩과 윈도우의 + UTF-8 인코딩으로 변환합니다. ascii 모드를 사용하면 UTF-16 인코딩 ("u")을 유지하는 옵션과 UTF-16 + 입력("-ul" 및 "-ub")을 가정하는 옵션 값을 사용하지 않습니다. dos2unix에 UTF-16 을 지원하는지 + 알아보려면 "dos2unix -V"를 입력하십시오. 유니코드 섹션도 살펴보십시오. 7bit - 이 모드에서는 ASCII 영역 밖(128~255 값)의 모든 8비트 문자를 7비트 영역으로 변환합니다. + 이 모드에서는 아스키 영역 밖(128~255 값)의 모든 8비트 문자를 7비트 영역으로 변환합니다. iso DOS 문자 세트(코드 페이지)에서 유닉스 ISO 문자 세트 ISO-8859-1(Latin1)로 또는 그 반대로 문자를 변환합니다. ISO-8859-1에 대응하지 않는 DOS 문자는 변환할 수 없어 구두점으로 변환합니다. @@ -421,10 +442,10 @@ 인코딩합니다. 변환 - 유니코드 텍스트 파일에는 DOS, 유닉스, 맥 개행 문자를 일반 텍스트 파일처럼 가질 수 있습니다. + 유니코드 텍스트 파일에는 DOS, 유닉스, 맥 개행 문자를 아스키 텍스트 파일처럼 가질 수 있습니다. - dos2unix와 unix2dos의 모든 버전에서는 UTF-8이 ASCII와의 하위 호환성을 고려했기 때문에 UTF-8 인코딩 - 파일을 변환할 수 있습니다. + dos2unix와 unix2dos의 모든 버전에서는 UTF-8이 아스키와의 하위 호환성을 고려했기 때문에 UTF-8 인코딩 파일을 + 변환할 수 있습니다. UTF-16을 지원하는 dos2unix와 unix2dos는 UTF-16 리틀엔디언 및 빅엔디언 인코딩 텍스트 파일을 모두 읽을 수 있습니다. dos2unix에 UTF-16 지원 기능이 들어갔는지 확인하려면 "dos2unix -V" 명령을 입력하십시오. @@ -447,7 +468,7 @@ 바이트 순서 표시(BOM) 윈도우에서는 유니코드 텍스트 파일에 대부분 윈도우 프로그램(메모장 포함)에서 BOM을 기본으로 추가하기 때문에 보통 바이트 순서 - 표시(BOM)가 들어갑니다. 링크를 + 표시(BOM)가 들어갑니다. 링크를 참고하십시오. 유닉스에서는 유니코드 파일에 BOM이 들어가지 않습니다. 텍스트 파일을 로캘 문자 인코딩으로 인코딩했다고 가정합니다. @@ -492,10 +513,10 @@ GB18030 GB18030은 중화인민공화국 정부 표준입니다. GB18030 표준 하위 필수 세트는 중화인민공화국에서 판매하는 모든 프로그램 - 제품에 공식적으로 필요합니다. 링크를 참고하십시오. + 제품에 공식적으로 필요합니다. 링크를 참고하십시오. GB18030은 유니코드와 완벽하게 호환하며, 유니코드 변환 형식으로 고려할 수 있습니다. UTF-8과 유사하게, GB18030은 - ASCII와 호환성을 지닙니다. GB18030은 또한 GBK로 알려진 윈도우 코드 페이지 936과도 호환성이 있습니다. + 아스키와 호환성을 지닙니다. GB18030은 또한 GBK로 알려진 윈도우 코드 페이지 936과도 호환성이 있습니다. 유닉스/리눅스에서 UTF-16 파일은 로캘 인코딩을 GB18030으로 설정하면 GB18030으로 변환합니다. 참고로 시스템에서 해당 로캘을 지원할 경우에만 동작합니다. 지원 로캘 목록을 살펴보려면 "locale -a" 명령을 사용하십시오. @@ -594,8 +615,8 @@ GB18030 export LANG=en_GB.UTF-8 English, UK, UTF-8 encoding 언어 및 국가 코드 전체 목록을 보려면 - gettext 설명서를 참고하십시오 + gettext 설명서를 참고하십시오 유닉스 시스템에서는 locale(1) 명령을 활용하여 로캘별 정보를 가져올 수 있습니다. @@ -604,8 +625,8 @@ GB18030 LANGUAGE를 LANG보다 우선하여 취급합니다. 예를 들면 네덜란드어를 먼저 그 다음에 독일어를 설정할 경우 "LANGUAGE=nl:de"(으)로 설정합니다. LANGUAGE 환경 변수에 언어별 우선 순위를 두어 사용할 수 있기 전에 LANG 환경 변수에 "C" 대신 다른 값을 넣어 지역화를 우선 설정해야합니다. - gettext 설명서를 참고하십시오 + gettext 설명서를 참고하십시오 사용할 수 없는 언어를 선택했다면 표준 (국제) 영어 메시지로 나타납니다. @@ -626,13 +647,13 @@ GB18030 미출력 모드의 반환 값은 항상 0이지만, 명령행 옵션이 잘못됐을 경우는 제외합니다. 표준 - + - + - + - + 저자 Benjamin Lin - , Bernd Johannes Wuebben (mac2unix @@ -640,9 +661,9 @@ GB18030 , Erwin Waterlander - (maintainer) - 프로젝트 페이지: + 프로젝트 페이지: - SourceForge 페이지: + SourceForge 페이지: 추가 참조 file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/dos2unix/man/man1/dos2unix.1 b/dos2unix/man/man1/dos2unix.1 index c6cf0d0..68b2a57 100644 --- a/dos2unix/man/man1/dos2unix.1 +++ b/dos2unix/man/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2023-08-29" "dos2unix" "2023-08-29" +.TH dos2unix 1 "2024-01-22" "dos2unix" "2024-01-22" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -143,7 +143,7 @@ ownership as if it was converted in new file mode. See also options \f(CW\*(C`\- the user and group ownership of files. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" -Convert only line breaks. This is the default conversion mode. +Default conversion mode. See also section \s-1CONVERSION MODES.\s0 .IP "\fB\-iso\fR" 4 .IX Item "-iso" Conversion between \s-1DOS\s0 and \s-1ISO\-8859\-1\s0 character set. See also section @@ -289,6 +289,18 @@ Example output: .Sp Note that sometimes a binary file can be mistaken for a text file. See also option \f(CW\*(C`\-s\*(C'\fR. .Sp +If in addition option \f(CW\*(C`\-e\*(C'\fR or \f(CW\*(C`\-\-add\-eol\*(C'\fR is used also the type of the +line break of the last line is printed, or \f(CW\*(C`noeol\*(C'\fR if there is none. +.Sp +Example output: +.Sp +.Vb 4 +\& 6 0 0 no_bom text dos dos.txt +\& 0 6 0 no_bom text unix unix.txt +\& 0 0 6 no_bom text mac mac.txt +\& 1 0 0 no_bom text noeol noeol_dos.txt +.Ve +.Sp Optionally extra flags can be set to change the output. One or more flags can be added. .RS 4 @@ -313,12 +325,18 @@ Print the byte order mark. .IP "\fBt\fR" 4 .IX Item "t" Print if file is text or binary. +.IP "\fBe\fR" 4 +.IX Item "e" +Print the type of the line break of the last line, or \f(CW\*(C`noeol\*(C'\fR if there is none. .IP "\fBc\fR" 4 .IX Item "c" Print only the files that would be converted. .Sp With the \f(CW\*(C`c\*(C'\fR flag dos2unix will print only the files that contain \s-1DOS\s0 line breaks, unix2dos will print only file names that have Unix line breaks. +.Sp +If in addition option \f(CW\*(C`\-e\*(C'\fR or \f(CW\*(C`\-\-add\-eol\*(C'\fR is used also the files that lack a +line break on the last line will be printed. .IP "\fBh\fR" 4 .IX Item "h" Print a header. @@ -360,6 +378,12 @@ List the files that have Unix line breaks: \& unix2dos \-ic *.txt .Ve .Sp +List the files that have \s-1DOS\s0 line breaks or lack a line break on the last line: +.Sp +.Vb 1 +\& dos2unix \-e \-ic *.txt +.Ve +.Sp Convert only files that have \s-1DOS\s0 line breaks and leave the other files untouched: .Sp .Vb 1 @@ -531,7 +555,7 @@ Keep symbolic links and targets unchanged (default). Display version information and exit. .SH "MAC MODE" .IX Header "MAC MODE" -In normal mode line breaks are converted from \s-1DOS\s0 to Unix and vice versa. +By default line breaks are converted from \s-1DOS\s0 to Unix and vice versa. Mac line breaks are not converted. .PP In Mac mode line breaks are converted from Mac to Unix and vice versa. \s-1DOS\s0 @@ -543,12 +567,15 @@ commands \f(CW\*(C`mac2unix\*(C'\fR or \f(CW\*(C`unix2mac\*(C'\fR. .IX Header "CONVERSION MODES" .IP "\fBascii\fR" 4 .IX Item "ascii" -In mode \f(CW\*(C`ascii\*(C'\fR only line breaks are converted. This is the default conversion -mode. -.Sp -Although the name of this mode is \s-1ASCII,\s0 which is a 7 bit standard, the -actual mode is 8 bit. Use always this mode when converting Unicode \s-1UTF\-8\s0 -files. +This is the default conversion mode. This mode is for converting \s-1ASCII\s0 and +ASCII-compatible encoded files, like \s-1UTF\-8.\s0 Enabling \fBascii\fR mode disables +\&\fB7bit\fR and \fBiso\fR mode. +.Sp +If dos2unix has \s-1UTF\-16\s0 support, \s-1UTF\-16\s0 encoded files are converted to the +current locale character encoding on \s-1POSIX\s0 systems and to \s-1UTF\-8\s0 on Windows. +Enabling \fBascii\fR mode disables the option to keep \s-1UTF\-16\s0 encoding (\f(CW\*(C`\-u\*(C'\fR) and +the options to assume \s-1UTF\-16\s0 input (\f(CW\*(C`\-ul\*(C'\fR and \f(CW\*(C`\-ub\*(C'\fR). To see if dos2unix has +\&\s-1UTF\-16\s0 support type \f(CW\*(C`dos2unix \-V\*(C'\fR. See also section \s-1UNICODE.\s0 .IP "\fB7bit\fR" 4 .IX Item "7bit" In this mode all 8 bit non-ASCII characters (with values from 128 to 255) @@ -633,7 +660,7 @@ encoded in \s-1UTF\-8, UTF\-16,\s0 or \s-1UTF\-16\s0 big endian, but are mostly \&\s-1UTF\-16\s0 format. .SS "Conversion" .IX Subsection "Conversion" -Unicode text files can have \s-1DOS,\s0 Unix or Mac line breaks, like regular text +Unicode text files can have \s-1DOS,\s0 Unix or Mac line breaks, like \s-1ASCII\s0 text files. .PP All versions of dos2unix and unix2dos can convert \s-1UTF\-8\s0 encoded files, because @@ -665,7 +692,7 @@ Dos2unix and unix2dos have no option to convert \s-1UTF\-8\s0 files to \s-1UTF\- .IX Subsection "Byte Order Mark" On Windows Unicode text files typically have a Byte Order Mark (\s-1BOM\s0), because many Windows programs (including Notepad) add BOMs by default. See also -. +. .PP On Unix Unicode files typically don't have a \s-1BOM.\s0 It is assumed that text files are encoded in the locale character encoding. @@ -723,7 +750,7 @@ Convert from Unix \s-1UTF\-8\s0 to Windows \s-1UTF\-16:\s0 .IX Header "GB18030" \&\s-1GB18030\s0 is a Chinese government standard. A mandatory subset of the \s-1GB18030\s0 standard is officially required for all software products sold in China. See -also . +also . .PP \&\s-1GB18030\s0 is fully compatible with Unicode, and can be considered an unicode transformation format. Like \s-1UTF\-8, GB18030\s0 is compatible with \s-1ASCII. GB18030\s0 @@ -864,7 +891,7 @@ shells: .Ve .Sp For a complete list of language and country codes see the gettext manual: - + .Sp On Unix systems you can use the command \fBlocale\fR\|(1) to get locale specific information. @@ -876,7 +903,7 @@ For instance, first Dutch and then German: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. You enable localization, by setting \s-1LANG\s0 (or \s-1LC_ALL\s0) to a value other than \&\*(L"C\*(R", before you can use a language priority list through the \s-1LANGUAGE\s0 variable. See also the gettext manual: - + .Sp If you select a language which is not available you will get the standard English messages. @@ -901,13 +928,13 @@ The return value is always zero in quiet mode, except when wrong command-line op are used. .SH "STANDARDS" .IX Header "STANDARDS" - + .PP - + .PP - + .PP - + .SH "AUTHORS" .IX Header "AUTHORS" Benjamin Lin \- , @@ -915,9 +942,9 @@ Bernd Johannes Wuebben (mac2unix mode) \- , Christian Wurll (add extra newline) \- , Erwin Waterlander \- (maintainer) .PP -Project page: +Project page: .PP -SourceForge page: +SourceForge page: .SH "SEE ALSO" .IX Header "SEE ALSO" \&\fBfile\fR\|(1) diff --git a/dos2unix/man/man1/dos2unix.htm b/dos2unix/man/man1/dos2unix.htm index beef4a9..674153a 100644 --- a/dos2unix/man/man1/dos2unix.htm +++ b/dos2unix/man/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.5.1 - DOS/MAC to UNIX and vice versa text file format converter +dos2unix 7.5.2 - DOS/MAC to UNIX and vice versa text file format converter @@ -89,7 +89,7 @@

OPTIONS

-ascii
-

Convert only line breaks. This is the default conversion mode.

+

Default conversion mode. See also section CONVERSION MODES.

-iso
@@ -246,6 +246,15 @@

OPTIONS

Note that sometimes a binary file can be mistaken for a text file. See also option -s.

+

If in addition option -e or --add-eol is used also the type of the line break of the last line is printed, or noeol if there is none.

+ +

Example output:

+ +
6       0       0  no_bom    text   dos     dos.txt
+0       6       0  no_bom    text   unix    unix.txt
+0       0       6  no_bom    text   mac     mac.txt
+1       0       0  no_bom    text   noeol   noeol_dos.txt
+

Optionally extra flags can be set to change the output. One or more flags can be added.

@@ -285,6 +294,12 @@

OPTIONS

Print if file is text or binary.

+ +
e
+
+ +

Print the type of the line break of the last line, or noeol if there is none.

+
c
@@ -293,6 +308,8 @@

OPTIONS

With the c flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks.

+

If in addition option -e or --add-eol is used also the files that lack a line break on the last line will be printed.

+
h
@@ -330,6 +347,10 @@

OPTIONS

unix2dos -ic *.txt
+

List the files that have DOS line breaks or lack a line break on the last line:

+ +
dos2unix -e -ic *.txt
+

Convert only files that have DOS line breaks and leave the other files untouched:

dos2unix -ic0 *.txt | xargs -0 dos2unix
@@ -503,7 +524,7 @@

OPTIONS

MAC MODE

-

In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted.

+

By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted.

In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed.

@@ -516,9 +537,9 @@

CONVERSION MODES

ascii
-

In mode ascii only line breaks are converted. This is the default conversion mode.

+

This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling ascii mode disables 7bit and iso mode.

-

Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files.

+

If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling ascii mode disables the option to keep UTF-16 encoding (-u) and the options to assume UTF-16 input (-ul and -ub). To see if dos2unix has UTF-16 support type dos2unix -V. See also section UNICODE.

7bit
@@ -583,7 +604,7 @@

Encodings

Conversion

-

Unicode text files can have DOS, Unix or Mac line breaks, like regular text files.

+

Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files.

All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII.

@@ -603,7 +624,7 @@

Conversion

Byte Order Mark

-

On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also http://en.wikipedia.org/wiki/Byte_order_mark.

+

On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also https://en.wikipedia.org/wiki/Byte_order_mark.

On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding.

@@ -643,7 +664,7 @@

Unicode examples

GB18030

-

GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also http://en.wikipedia.org/wiki/GB_18030.

+

GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also https://en.wikipedia.org/wiki/GB_18030.

GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK.

@@ -742,7 +763,7 @@

LOCALIZATION

export LANG=en_US.iso88591 English, USA, Latin-1 encoding export LANG=en_GB.UTF-8 English, UK, UTF-8 encoding -

For a complete list of language and country codes see the gettext manual: http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

+

For a complete list of language and country codes see the gettext manual: https://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

On Unix systems you can use the command locale(1) to get locale specific information.

@@ -750,7 +771,7 @@

LOCALIZATION

LANGUAGE
-

With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: LANGUAGE=nl:de. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than "C", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

+

With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: LANGUAGE=nl:de. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than "C", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: https://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

If you select a language which is not available you will get the standard English messages.

@@ -775,21 +796,21 @@

RETURN VALUE

STANDARDS

-

http://en.wikipedia.org/wiki/Text_file

+

https://en.wikipedia.org/wiki/Text_file

-

http://en.wikipedia.org/wiki/Carriage_return

+

https://en.wikipedia.org/wiki/Carriage_return

-

http://en.wikipedia.org/wiki/Newline

+

https://en.wikipedia.org/wiki/Newline

-

http://en.wikipedia.org/wiki/Unicode

+

https://en.wikipedia.org/wiki/Unicode

AUTHORS

Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)

-

Project page: http://waterlan.home.xs4all.nl/dos2unix.html

+

Project page: https://waterlan.home.xs4all.nl/dos2unix.html

-

SourceForge page: http://sourceforge.net/projects/dos2unix/

+

SourceForge page: https://sourceforge.net/projects/dos2unix/

SEE ALSO

diff --git a/dos2unix/man/man1/dos2unix.pod b/dos2unix/man/man1/dos2unix.pod index 37fe03d..dfddfa5 100644 --- a/dos2unix/man/man1/dos2unix.pod +++ b/dos2unix/man/man1/dos2unix.pod @@ -29,10 +29,10 @@ # # To learn what TOP LEVEL section to use in manual pages, # see POSIX/Susv standard and "Utility Description Defaults" at -# http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap01.html#tag_01_11 +# https://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap01.html#tag_01_11 # # This is manual page in Perl POD format. Read more at -# http://perldoc.perl.org/perlpod.html or run command: +# https://perldoc.perl.org/perlpod.html or run command: # # perldoc perlpod | less # @@ -118,7 +118,7 @@ the user and group ownership of files. =item B<-ascii> -Convert only line breaks. This is the default conversion mode. +Default conversion mode. See also section CONVERSION MODES. =item B<-iso> @@ -284,6 +284,16 @@ Example output: Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>. +If in addition option C<-e> or C<--add-eol> is used also the type of the +line break of the last line is printed, or C if there is none. + +Example output: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Optionally extra flags can be set to change the output. One or more flags can be added. @@ -316,6 +326,10 @@ Print the byte order mark. Print if file is text or binary. +=item B + +Print the type of the line break of the last line, or C if there is none. + =item B Print only the files that would be converted. @@ -323,6 +337,9 @@ Print only the files that would be converted. With the C flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks. +If in addition option C<-e> or C<--add-eol> is used also the files that lack a +line break on the last line will be printed. + =item B Print a header. @@ -355,6 +372,10 @@ List the files that have Unix line breaks: unix2dos -ic *.txt +List the files that have DOS line breaks or lack a line break on the last line: + + dos2unix -e -ic *.txt + Convert only files that have DOS line breaks and leave the other files untouched: dos2unix -ic0 *.txt | xargs -0 dos2unix @@ -539,7 +560,7 @@ Display version information and exit. =head1 MAC MODE -In normal mode line breaks are converted from DOS to Unix and vice versa. +By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted. In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS @@ -554,12 +575,15 @@ commands C or C. =item B -In mode C only line breaks are converted. This is the default conversion -mode. +This is the default conversion mode. This mode is for converting ASCII and +ASCII-compatible encoded files, like UTF-8. Enabling B mode disables +B<7bit> and B mode. -Although the name of this mode is ASCII, which is a 7 bit standard, the -actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 -files. +If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the +current locale character encoding on POSIX systems and to UTF-8 on Windows. +Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and +the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has +UTF-16 support type C. See also section UNICODE. =item B<7bit> @@ -634,7 +658,7 @@ UTF-16 format. =head2 Conversion -Unicode text files can have DOS, Unix or Mac line breaks, like regular text +Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files. All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because @@ -667,7 +691,7 @@ ISO and 7-bit mode conversion do not work on UTF-16 files. On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also -L. +L. On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding. @@ -720,7 +744,7 @@ Convert from Unix UTF-8 to Windows UTF-16: GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See -also L. +also L. GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 @@ -835,7 +859,7 @@ shells: export LANG=en_GB.UTF-8 English, UK, UTF-8 encoding For a complete list of language and country codes see the gettext manual: -L +L On Unix systems you can use the command locale(1) to get locale specific information. @@ -848,7 +872,7 @@ For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than "C", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: -L +L If you select a language which is not available you will get the standard English messages. @@ -878,13 +902,13 @@ are used. =head1 STANDARDS -L +L -L +L -L +L -L +L =head1 AUTHORS @@ -893,9 +917,9 @@ Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer) -Project page: L +Project page: L -SourceForge page: L +SourceForge page: L =head1 SEE ALSO diff --git a/dos2unix/man/man1/dos2unix.txt b/dos2unix/man/man1/dos2unix.txt index b80fdc8..c64b250 100644 --- a/dos2unix/man/man1/dos2unix.txt +++ b/dos2unix/man/man1/dos2unix.txt @@ -62,7 +62,7 @@ OPTIONS user and group ownership of files. -ascii - Convert only line breaks. This is the default conversion mode. + Default conversion mode. See also section CONVERSION MODES. -iso Conversion between DOS and ISO-8859-1 character set. See also @@ -212,6 +212,17 @@ OPTIONS Note that sometimes a binary file can be mistaken for a text file. See also option "-s". + If in addition option "-e" or "--add-eol" is used also the type of + the line break of the last line is printed, or "noeol" if there is + none. + + Example output: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Optionally extra flags can be set to change the output. One or more flags can be added. @@ -231,12 +242,18 @@ OPTIONS t Print if file is text or binary. + e Print the type of the line break of the last line, or "noeol" if + there is none. + c Print only the files that would be converted. With the "c" flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks. + If in addition option "-e" or "--add-eol" is used also the files + that lack a line break on the last line will be printed. + h Print a header. p Show file names without path. @@ -263,6 +280,11 @@ OPTIONS unix2dos -ic *.txt + List the files that have DOS line breaks or lack a line break on the + last line: + + dos2unix -e -ic *.txt + Convert only files that have DOS line breaks and leave the other files untouched: @@ -431,8 +453,8 @@ OPTIONS Display version information and exit. MAC MODE - In normal mode line breaks are converted from DOS to Unix and vice - versa. Mac line breaks are not converted. + By default line breaks are converted from DOS to Unix and vice versa. + Mac line breaks are not converted. In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed. @@ -442,12 +464,16 @@ MAC MODE CONVERSION MODES ascii - In mode "ascii" only line breaks are converted. This is the default - conversion mode. + This is the default conversion mode. This mode is for converting + ASCII and ASCII-compatible encoded files, like UTF-8. Enabling ascii + mode disables 7bit and iso mode. - Although the name of this mode is ASCII, which is a 7 bit standard, - the actual mode is 8 bit. Use always this mode when converting - Unicode UTF-8 files. + If dos2unix has UTF-16 support, UTF-16 encoded files are converted + to the current locale character encoding on POSIX systems and to + UTF-8 on Windows. Enabling ascii mode disables the option to keep + UTF-16 encoding ("-u") and the options to assume UTF-16 input ("-ul" + and "-ub"). To see if dos2unix has UTF-16 support type "dos2unix + -V". See also section UNICODE. 7bit In this mode all 8 bit non-ASCII characters (with values from 128 to @@ -517,7 +543,7 @@ UNICODE encoded in UTF-16 format. Conversion - Unicode text files can have DOS, Unix or Mac line breaks, like regular + Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files. All versions of dos2unix and unix2dos can convert UTF-8 encoded files, @@ -551,7 +577,7 @@ UNICODE Byte Order Mark On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. - See also . + See also . On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding. @@ -602,7 +628,7 @@ UNICODE GB18030 GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold - in China. See also . + in China. See also . GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with @@ -717,8 +743,8 @@ LOCALIZATION For a complete list of language and country codes see the gettext manual: - + On Unix systems you can use the command locale(1) to get locale specific information. @@ -731,8 +757,8 @@ LOCALIZATION LANG (or LC_ALL) to a value other than "C", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: - + If you select a language which is not available you will get the standard English messages. @@ -755,13 +781,13 @@ RETURN VALUE command-line options are used. STANDARDS - + - + - + - + AUTHORS Benjamin Lin - , Bernd Johannes Wuebben (mac2unix @@ -769,9 +795,9 @@ AUTHORS , Erwin Waterlander - (maintainer) - Project page: + Project page: - SourceForge page: + SourceForge page: SEE ALSO file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/dos2unix/man/nl/man1/dos2unix.1 b/dos2unix/man/nl/man1/dos2unix.1 index 4e212d3..794862a 100644 --- a/dos2unix/man/nl/man1/dos2unix.1 +++ b/dos2unix/man/nl/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2023-08-29" "dos2unix" "2023-08-29" +.TH dos2unix 1 "2024-01-22" "dos2unix" "2024-01-22" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -122,7 +122,7 @@ Wijziging van bestandseigenaar toestaan in oud-bestand-modus. When this option is used, the conversion will not be aborted when the user and/or group ownership of the original file can't be preserved in old file mode. Conversion will continue and the converted file will get the same new ownership as if it was converted in new file mode. See also options \f(CW\*(C`\-o\*(C'\fR and \f(CW\*(C`\-n\*(C'\fR. This option is only available if dos2unix has support for preserving the user and group ownership of files. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" -Alleen regeleindes converteren. Dit is de standaardconversiemodus. +Default conversion mode. See also section \s-1CONVERSION MODES.\s0 .IP "\fB\-iso\fR" 4 .IX Item "-iso" Conversie tussen de tekensets \s-1DOS\s0 en \s-1ISO\-8859\-1.\s0 Zie ook de sectie \fB\s-1CONVERSIEMODI\s0\fR. @@ -224,6 +224,17 @@ Voorbeelduitvoer: .Sp Merk op dat een binair bestand soms voor een tekstbestand aangezien kan worden. Zie ook optie \f(CW\*(C`\-s\*(C'\fR. .Sp +If in addition option \f(CW\*(C`\-e\*(C'\fR or \f(CW\*(C`\-\-add\-eol\*(C'\fR is used also the type of the line break of the last line is printed, or \f(CW\*(C`noeol\*(C'\fR if there is none. +.Sp +Voorbeelduitvoer: +.Sp +.Vb 4 +\& 6 0 0 no_bom text dos dos.txt +\& 0 6 0 no_bom text unix unix.txt +\& 0 0 6 no_bom text mac mac.txt +\& 1 0 0 no_bom text noeol noeol_dos.txt +.Ve +.Sp Bij de optie kunnen één of meer vlaggen meegegeven worden om de uitvoer te beperken. .RS 4 .IP "\fB0\fR" 4 @@ -244,11 +255,16 @@ De Byte-Order-Mark tonen. .IP "\fBt\fR" 4 .IX Item "t" Tonen of het bestand tekst is of binair. +.IP "\fBe\fR" 4 +.IX Item "e" +Print the type of the line break of the last line, or \f(CW\*(C`noeol\*(C'\fR if there is none. .IP "\fBc\fR" 4 .IX Item "c" Alleen de namen tonen van de bestanden die geconverteerd zouden worden. .Sp Met de vlag \f(CW\*(C`c\*(C'\fR toont dos2unix alleen de bestanden die DOS-regeleindes bevatten, en unix2dos alleen de bestanden die Unix-regeleindes bevatten. +.Sp +If in addition option \f(CW\*(C`\-e\*(C'\fR or \f(CW\*(C`\-\-add\-eol\*(C'\fR is used also the files that lack a line break on the last line will be printed. .IP "\fBh\fR" 4 .IX Item "h" Een kopregel printen. @@ -290,6 +306,12 @@ De bestanden opsommen die Unix-regeleindes bevatten: \& unix2dos \-ic *.txt .Ve .Sp +List the files that have \s-1DOS\s0 line breaks or lack a line break on the last line: +.Sp +.Vb 1 +\& dos2unix \-e \-ic *.txt +.Ve +.Sp Alleen bestanden die DOS-regeleindes bevatten converteren en andere bestanden ongemoeid laten: .Sp .Vb 1 @@ -410,7 +432,7 @@ Symbolische koppelingen en doelen ongewijzigd laten (standaard). Versie-informatie tonen. .SH "MAC-MODUS" .IX Header "MAC-MODUS" -In normale modus worden DOS-regeleindes naar Unix omgezet en vice versa. Mac-regeleindes worden niet omgezet. +By default line breaks are converted from \s-1DOS\s0 to Unix and vice versa. Mac line breaks are not converted. .PP In Mac-modus worden Mac-regeleindes naar Unix omgezet en vice versa. DOS-regeleindes blijven ongewijzigd. .PP @@ -419,9 +441,9 @@ Om in Mac-modus te draaien kunt u de opdrachtregeloptie \f(CW\*(C`\-c mac\*(C'\f .IX Header "CONVERSIEMODI" .IP "\fBascii\fR" 4 .IX Item "ascii" -In modus \f(CW\*(C`ascii\*(C'\fR worden alleen regeleindes omgezet. Dit is de standaardmodus. +This is the default conversion mode. This mode is for converting \s-1ASCII\s0 and ASCII-compatible encoded files, like \s-1UTF\-8.\s0 Enabling \fBascii\fR mode disables \fB7bit\fR and \fBiso\fR mode. .Sp -Hoewel de naam van deze modus \s-1ASCII\s0 is, wat een 7\-bits standaard is, is de werkelijke modus 8\-bits. Gebruik altijd deze modus wanneer u Unicode UTF\-8\-bestanden omzet. +If dos2unix has \s-1UTF\-16\s0 support, \s-1UTF\-16\s0 encoded files are converted to the current locale character encoding on \s-1POSIX\s0 systems and to \s-1UTF\-8\s0 on Windows. Enabling \fBascii\fR mode disables the option to keep \s-1UTF\-16\s0 encoding (\f(CW\*(C`\-u\*(C'\fR) and the options to assume \s-1UTF\-16\s0 input (\f(CW\*(C`\-ul\*(C'\fR and \f(CW\*(C`\-ub\*(C'\fR). To see if dos2unix has \s-1UTF\-16\s0 support type \f(CW\*(C`dos2unix \-V\*(C'\fR. See also section \s-1UNICODE.\s0 .IP "\fB7bit\fR" 4 .IX Item "7bit" Alle 8\-bits niet-ASCII lettertekens (met waardes van 128 t/m 255) worden omgezet naar een 7\-bits spatie. @@ -491,7 +513,7 @@ Zie ook en . +On Windows Unicode text files typically have a Byte Order Mark (\s-1BOM\s0), because many Windows programs (including Notepad) add BOMs by default. See also . .PP Op Unix hebben Unicode-tekstbestanden meestal geen \s-1BOM.\s0 Er wordt aangenomen dat de codering van tekstbestanden gelijk is aan de tekencodering van de ingestelde taalregio. .PP @@ -555,7 +577,7 @@ Omzetten van Unix \s-1UTF\-8\s0 naar Windows \s-1UTF\-16:\s0 .Ve .SH "GB18030" .IX Header "GB18030" -\&\s-1GB18030\s0 is een standaard van de Chinese overheid. Een subset van de GB18030\-standaard is officieel verplicht voor alle softwareproducten die in China verkocht worden. Zie ook . +\&\s-1GB18030\s0 is a Chinese government standard. A mandatory subset of the \s-1GB18030\s0 standard is officially required for all software products sold in China. See also . .PP \&\s-1GB18030\s0 is volledig compatibel met Unicode, en kan als een Unicodetransformatie beschouwd worden. Net als \s-1UTF\-8\s0 is \s-1GB18030\s0 compatibel met \s-1ASCII.\s0 \s-1GB18030\s0 is ook compatibel met Windows-codetabel 936 (ook wel \s-1GBK\s0 genoemd). .PP @@ -680,12 +702,12 @@ De primaire taal wordt geselecteerd via de omgevingsvariabele \s-1LANG.\s0 De v \& export LANG=en_GB.UTF\-8 Engels, GB, UTF\-8\-codering .Ve .Sp -Voor een complete lijst van taal\- en landcodes zie de gettext-handleiding: +For a complete list of language and country codes see the gettext manual: .Sp Op Unix-systemen kunt u de opdracht \fBlocale\fR(1) gebruiken om specifieke taalregio-informatie te verkrijgen. .IP "\fB\s-1LANGUAGE\s0\fR" 4 .IX Item "LANGUAGE" -Met de omgevingsvariabele \s-1LANGUAGE\s0 kunt u een prioriteitenlijst specificeren van talen, gescheiden door dubbele punten. Dos2unix geeft voorrang aan \s-1LANGUAGE\s0 boven \s-1LANG.\s0 Bijvoorbeeld, eerst Nederlands en dan Duits: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. U moet eerst lokalisatie in werking stellen, door het instellen van \s-1LANG\s0 (of \s-1LC_ALL\s0) op een waarde ongelijk aan \*(L"C\*(R", voordat u een talen-prioriteitenlijst kunt gebruiken via de variabele \s-1LANGUAGE.\s0 Zie ook de gettext-handleiding: +With the \s-1LANGUAGE\s0 environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to \s-1LANGUAGE\s0 over \s-1LANG.\s0 For instance, first Dutch and then German: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. You have to first enable localization, by setting \s-1LANG\s0 (or \s-1LC_ALL\s0) to a value other than \*(L"C\*(R", before you can use a language priority list through the \s-1LANGUAGE\s0 variable. See also the gettext manual: .Sp Als u een taal kiest die niet beschikbaar is, worden de standaard Engelse berichten gebruikt. .IP "\fB\s-1DOS2UNIX_LOCALEDIR\s0\fR" 4 @@ -704,20 +726,20 @@ Bij succes wordt nul teruggegeven. Wanneer een systeemfout optreedt wordt het l De afsluitwaarde is altijd nul in de stillewerkingsmodus, behalve wanneer verkeerde opties worden gegeven. .SH "STANDAARDEN" .IX Header "STANDAARDEN" - + .PP - + .PP - + .PP - + .SH "AUTEURS" .IX Header "AUTEURS" Benjamin Lin \- , Bernd Johannes Wuebben (mac2unix\-modus) \- , Christian Wurll (toevoegen van extra regeleindes) \- , Erwin Waterlander \- (beheerder) .PP -Projectpagina: +Project page: .PP -SourceForge-pagina: +SourceForge page: .SH "ZIE OOK" .IX Header "ZIE OOK" \&\fBfile\fR\|(1) \fBfind\fR\|(1) \fBiconv\fR\|(1) \fBlocale\fR\|(1) \fBxargs\fR\|(1) diff --git a/dos2unix/man/nl/man1/dos2unix.htm b/dos2unix/man/nl/man1/dos2unix.htm index 92b7293..8b54a5e 100644 --- a/dos2unix/man/nl/man1/dos2unix.htm +++ b/dos2unix/man/nl/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.5.1 - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter +dos2unix 7.5.2 - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter @@ -89,7 +89,7 @@

OPTIES

-ascii
-

Alleen regeleindes converteren. Dit is de standaardconversiemodus.

+

Default conversion mode. See also section CONVERSION MODES.

-iso
@@ -246,6 +246,15 @@

OPTIES

Merk op dat een binair bestand soms voor een tekstbestand aangezien kan worden. Zie ook optie -s.

+

If in addition option -e or --add-eol is used also the type of the line break of the last line is printed, or noeol if there is none.

+ +

Voorbeelduitvoer:

+ +
6       0       0  no_bom    text   dos     dos.txt
+0       6       0  no_bom    text   unix    unix.txt
+0       0       6  no_bom    text   mac     mac.txt
+1       0       0  no_bom    text   noeol   noeol_dos.txt
+

Bij de optie kunnen één of meer vlaggen meegegeven worden om de uitvoer te beperken.

@@ -285,6 +294,12 @@

OPTIES

Tonen of het bestand tekst is of binair.

+ +
e
+
+ +

Print the type of the line break of the last line, or noeol if there is none.

+
c
@@ -293,6 +308,8 @@

OPTIES

Met de vlag c toont dos2unix alleen de bestanden die DOS-regeleindes bevatten, en unix2dos alleen de bestanden die Unix-regeleindes bevatten.

+

If in addition option -e or --add-eol is used also the files that lack a line break on the last line will be printed.

+
h
@@ -330,6 +347,10 @@

OPTIES

unix2dos -ic *.txt
+

List the files that have DOS line breaks or lack a line break on the last line:

+ +
dos2unix -e -ic *.txt
+

Alleen bestanden die DOS-regeleindes bevatten converteren en andere bestanden ongemoeid laten:

dos2unix -ic0 *.txt | xargs -0 dos2unix
@@ -503,7 +524,7 @@

OPTIES

MAC-MODUS

-

In normale modus worden DOS-regeleindes naar Unix omgezet en vice versa. Mac-regeleindes worden niet omgezet.

+

By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted.

In Mac-modus worden Mac-regeleindes naar Unix omgezet en vice versa. DOS-regeleindes blijven ongewijzigd.

@@ -516,9 +537,9 @@

CONVERSIEMODI

ascii
-

In modus ascii worden alleen regeleindes omgezet. Dit is de standaardmodus.

+

This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling ascii mode disables 7bit and iso mode.

-

Hoewel de naam van deze modus ASCII is, wat een 7-bits standaard is, is de werkelijke modus 8-bits. Gebruik altijd deze modus wanneer u Unicode UTF-8-bestanden omzet.

+

If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling ascii mode disables the option to keep UTF-16 encoding (-u) and the options to assume UTF-16 input (-ul and -ub). To see if dos2unix has UTF-16 support type dos2unix -V. See also section UNICODE.

7bit
@@ -583,7 +604,7 @@

Coderingen

Conversie

-

Unicode-tekstbestanden kunnen DOS-, Unix- of Mac-regeleindes hebben, net als reguliere tekstbestanden.

+

Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files.

Alle versies van dos2unix en unix2dos kunnen UTF-8-gecodeerde bestanden omzetten, want UTF-8 is ontworpen op compatibiliteit met ASCII.

@@ -603,7 +624,7 @@

Conversie

Byte-Order-Mark

-

Op Windows bevatten Unicode-tekstbestanden gewoonlijk een Byte-Order-Mark (BOM), omdat veel Windows-programma's (inclusief Kladblok) standaard een BOM toevoegen. Zie ook http://en.wikipedia.org/wiki/Byte_order_mark.

+

On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also https://en.wikipedia.org/wiki/Byte_order_mark.

Op Unix hebben Unicode-tekstbestanden meestal geen BOM. Er wordt aangenomen dat de codering van tekstbestanden gelijk is aan de tekencodering van de ingestelde taalregio.

@@ -643,7 +664,7 @@

Unicode-voorbeelden

GB18030

-

GB18030 is een standaard van de Chinese overheid. Een subset van de GB18030-standaard is officieel verplicht voor alle softwareproducten die in China verkocht worden. Zie ook http://en.wikipedia.org/wiki/GB_18030.

+

GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also https://en.wikipedia.org/wiki/GB_18030.

GB18030 is volledig compatibel met Unicode, en kan als een Unicodetransformatie beschouwd worden. Net als UTF-8 is GB18030 compatibel met ASCII. GB18030 is ook compatibel met Windows-codetabel 936 (ook wel GBK genoemd).

@@ -742,7 +763,7 @@

LOKALISATIE

export LANG=en_US.iso88591 Engels, VS, Latin-1-codering export LANG=en_GB.UTF-8 Engels, GB, UTF-8-codering -

Voor een complete lijst van taal- en landcodes zie de gettext-handleiding: http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

+

For a complete list of language and country codes see the gettext manual: https://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

Op Unix-systemen kunt u de opdracht locale(1) gebruiken om specifieke taalregio-informatie te verkrijgen.

@@ -750,7 +771,7 @@

LOKALISATIE

LANGUAGE
-

Met de omgevingsvariabele LANGUAGE kunt u een prioriteitenlijst specificeren van talen, gescheiden door dubbele punten. Dos2unix geeft voorrang aan LANGUAGE boven LANG. Bijvoorbeeld, eerst Nederlands en dan Duits: LANGUAGE=nl:de. U moet eerst lokalisatie in werking stellen, door het instellen van LANG (of LC_ALL) op een waarde ongelijk aan "C", voordat u een talen-prioriteitenlijst kunt gebruiken via de variabele LANGUAGE. Zie ook de gettext-handleiding: http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

+

With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: LANGUAGE=nl:de. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than "C", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: https://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

Als u een taal kiest die niet beschikbaar is, worden de standaard Engelse berichten gebruikt.

@@ -775,21 +796,21 @@

AFSLUITWAARDE

STANDAARDEN

-

http://nl.wikipedia.org/wiki/Tekstbestand

+

https://en.wikipedia.org/wiki/Text_file

-

http://nl.wikipedia.org/wiki/Carriage_Return

+

https://en.wikipedia.org/wiki/Carriage_return

-

http://nl.wikipedia.org/wiki/Linefeed

+

https://en.wikipedia.org/wiki/Newline

-

<http://nl.wikipedia.org/wiki/Unicode>

+

https://en.wikipedia.org/wiki/Unicode

AUTEURS

Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix-modus) - <wuebben@kde.org>, Christian Wurll (toevoegen van extra regeleindes) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (beheerder)

-

Projectpagina: http://waterlan.home.xs4all.nl/dos2unix.html

+

Project page: https://waterlan.home.xs4all.nl/dos2unix.html

-

SourceForge-pagina: http://sourceforge.net/projects/dos2unix/

+

SourceForge page: https://sourceforge.net/projects/dos2unix/

ZIE OOK

diff --git a/dos2unix/man/nl/man1/dos2unix.pod b/dos2unix/man/nl/man1/dos2unix.pod index 0a76c30..254a178 100644 --- a/dos2unix/man/nl/man1/dos2unix.pod +++ b/dos2unix/man/nl/man1/dos2unix.pod @@ -63,7 +63,7 @@ When this option is used, the conversion will not be aborted when the user and/o =item B<-ascii> -Alleen regeleindes converteren. Dit is de standaardconversiemodus. +Default conversion mode. See also section CONVERSION MODES. =item B<-iso> @@ -188,6 +188,15 @@ Voorbeelduitvoer: Merk op dat een binair bestand soms voor een tekstbestand aangezien kan worden. Zie ook optie C<-s>. +If in addition option C<-e> or C<--add-eol> is used also the type of the line break of the last line is printed, or C if there is none. + +Voorbeelduitvoer: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Bij de optie kunnen één of meer vlaggen meegegeven worden om de uitvoer te beperken. =over 4 @@ -216,12 +225,18 @@ De Byte-Order-Mark tonen. Tonen of het bestand tekst is of binair. +=item B + +Print the type of the line break of the last line, or C if there is none. + =item B Alleen de namen tonen van de bestanden die geconverteerd zouden worden. Met de vlag C toont dos2unix alleen de bestanden die DOS-regeleindes bevatten, en unix2dos alleen de bestanden die Unix-regeleindes bevatten. +If in addition option C<-e> or C<--add-eol> is used also the files that lack a line break on the last line will be printed. + =item B Een kopregel printen. @@ -254,6 +269,10 @@ De bestanden opsommen die Unix-regeleindes bevatten: unix2dos -ic *.txt +List the files that have DOS line breaks or lack a line break on the last line: + + dos2unix -e -ic *.txt + Alleen bestanden die DOS-regeleindes bevatten converteren en andere bestanden ongemoeid laten: dos2unix -ic0 *.txt | xargs -0 dos2unix @@ -388,7 +407,7 @@ Versie-informatie tonen. =head1 MAC-MODUS -In normale modus worden DOS-regeleindes naar Unix omgezet en vice versa. Mac-regeleindes worden niet omgezet. +By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted. In Mac-modus worden Mac-regeleindes naar Unix omgezet en vice versa. DOS-regeleindes blijven ongewijzigd. @@ -400,9 +419,9 @@ Om in Mac-modus te draaien kunt u de opdrachtregeloptie C<-c mac> gebruiken, of =item B -In modus C worden alleen regeleindes omgezet. Dit is de standaardmodus. +This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling B mode disables B<7bit> and B mode. -Hoewel de naam van deze modus ASCII is, wat een 7-bits standaard is, is de werkelijke modus 8-bits. Gebruik altijd deze modus wanneer u Unicode UTF-8-bestanden omzet. +If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has UTF-16 support type C. See also section UNICODE. =item B<7bit> @@ -462,7 +481,7 @@ Er bestaan verschillende Unicode-coderingen. Op Unix en Linux zijn Unicode-best =head2 Conversie -Unicode-tekstbestanden kunnen DOS-, Unix- of Mac-regeleindes hebben, net als reguliere tekstbestanden. +Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files. Alle versies van dos2unix en unix2dos kunnen UTF-8-gecodeerde bestanden omzetten, want UTF-8 is ontworpen op compatibiliteit met ASCII. @@ -482,7 +501,7 @@ ISO- en 7-bits-conversie werken niet op UTF-16-bestanden. =head2 Byte-Order-Mark -Op Windows bevatten Unicode-tekstbestanden gewoonlijk een Byte-Order-Mark (BOM), omdat veel Windows-programma's (inclusief Kladblok) standaard een BOM toevoegen. Zie ook L. +On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L. Op Unix hebben Unicode-tekstbestanden meestal geen BOM. Er wordt aangenomen dat de codering van tekstbestanden gelijk is aan de tekencodering van de ingestelde taalregio. @@ -522,7 +541,7 @@ Omzetten van Unix UTF-8 naar Windows UTF-16: =head1 GB18030 -GB18030 is een standaard van de Chinese overheid. Een subset van de GB18030-standaard is officieel verplicht voor alle softwareproducten die in China verkocht worden. Zie ook L. +GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L. GB18030 is volledig compatibel met Unicode, en kan als een Unicodetransformatie beschouwd worden. Net als UTF-8 is GB18030 compatibel met ASCII. GB18030 is ook compatibel met Windows-codetabel 936 (ook wel GBK genoemd). @@ -622,13 +641,13 @@ De primaire taal wordt geselecteerd via de omgevingsvariabele LANG. De variabel export LANG=en_US.iso88591 Engels, VS, Latin-1-codering export LANG=en_GB.UTF-8 Engels, GB, UTF-8-codering -Voor een complete lijst van taal- en landcodes zie de gettext-handleiding: L +For a complete list of language and country codes see the gettext manual: L Op Unix-systemen kunt u de opdracht B(1) gebruiken om specifieke taalregio-informatie te verkrijgen. =item B -Met de omgevingsvariabele LANGUAGE kunt u een prioriteitenlijst specificeren van talen, gescheiden door dubbele punten. Dos2unix geeft voorrang aan LANGUAGE boven LANG. Bijvoorbeeld, eerst Nederlands en dan Duits: C. U moet eerst lokalisatie in werking stellen, door het instellen van LANG (of LC_ALL) op een waarde ongelijk aan "C", voordat u een talen-prioriteitenlijst kunt gebruiken via de variabele LANGUAGE. Zie ook de gettext-handleiding: L +With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than "C", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L Als u een taal kiest die niet beschikbaar is, worden de standaard Engelse berichten gebruikt. @@ -654,21 +673,21 @@ De afsluitwaarde is altijd nul in de stillewerkingsmodus, behalve wanneer verkee =head1 STANDAARDEN -L +L -L +L -L +L - +L =head1 AUTEURS Benjamin Lin - , Bernd Johannes Wuebben (mac2unix-modus) - , Christian Wurll (toevoegen van extra regeleindes) - , Erwin Waterlander - (beheerder) -Projectpagina: L +Project page: L -SourceForge-pagina: L +SourceForge page: L =head1 ZIE OOK diff --git a/dos2unix/man/nl/man1/dos2unix.txt b/dos2unix/man/nl/man1/dos2unix.txt index 0428118..f3d1c1f 100644 --- a/dos2unix/man/nl/man1/dos2unix.txt +++ b/dos2unix/man/nl/man1/dos2unix.txt @@ -68,7 +68,7 @@ OPTIES user and group ownership of files. -ascii - Alleen regeleindes converteren. Dit is de standaardconversiemodus. + Default conversion mode. See also section CONVERSION MODES. -iso Conversie tussen de tekensets DOS en ISO-8859-1. Zie ook de sectie @@ -220,6 +220,17 @@ OPTIES Merk op dat een binair bestand soms voor een tekstbestand aangezien kan worden. Zie ook optie "-s". + If in addition option "-e" or "--add-eol" is used also the type of + the line break of the last line is printed, or "noeol" if there is + none. + + Voorbeelduitvoer: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Bij de optie kunnen één of meer vlaggen meegegeven worden om de uitvoer te beperken. @@ -239,6 +250,9 @@ OPTIES t Tonen of het bestand tekst is of binair. + e Print the type of the line break of the last line, or "noeol" if + there is none. + c Alleen de namen tonen van de bestanden die geconverteerd zouden worden. @@ -246,6 +260,9 @@ OPTIES DOS-regeleindes bevatten, en unix2dos alleen de bestanden die Unix-regeleindes bevatten. + If in addition option "-e" or "--add-eol" is used also the files + that lack a line break on the last line will be printed. + h Een kopregel printen. p Bestandsnamen tonen zonder pad. @@ -272,6 +289,11 @@ OPTIES unix2dos -ic *.txt + List the files that have DOS line breaks or lack a line break on the + last line: + + dos2unix -e -ic *.txt + Alleen bestanden die DOS-regeleindes bevatten converteren en andere bestanden ongemoeid laten: @@ -448,8 +470,8 @@ OPTIES Versie-informatie tonen. MAC-MODUS - In normale modus worden DOS-regeleindes naar Unix omgezet en vice versa. - Mac-regeleindes worden niet omgezet. + By default line breaks are converted from DOS to Unix and vice versa. + Mac line breaks are not converted. In Mac-modus worden Mac-regeleindes naar Unix omgezet en vice versa. DOS-regeleindes blijven ongewijzigd. @@ -459,12 +481,16 @@ MAC-MODUS CONVERSIEMODI ascii - In modus "ascii" worden alleen regeleindes omgezet. Dit is de - standaardmodus. + This is the default conversion mode. This mode is for converting + ASCII and ASCII-compatible encoded files, like UTF-8. Enabling ascii + mode disables 7bit and iso mode. - Hoewel de naam van deze modus ASCII is, wat een 7-bits standaard is, - is de werkelijke modus 8-bits. Gebruik altijd deze modus wanneer u - Unicode UTF-8-bestanden omzet. + If dos2unix has UTF-16 support, UTF-16 encoded files are converted + to the current locale character encoding on POSIX systems and to + UTF-8 on Windows. Enabling ascii mode disables the option to keep + UTF-16 encoding ("-u") and the options to assume UTF-16 input ("-ul" + and "-ub"). To see if dos2unix has UTF-16 support type "dos2unix + -V". See also section UNICODE. 7bit Alle 8-bits niet-ASCII lettertekens (met waardes van 128 t/m 255) @@ -534,8 +560,8 @@ UNICODE endian, maar ze zijn meestal gecodeerd in UTF-16. Conversie - Unicode-tekstbestanden kunnen DOS-, Unix- of Mac-regeleindes hebben, net - als reguliere tekstbestanden. + Unicode text files can have DOS, Unix or Mac line breaks, like ASCII + text files. Alle versies van dos2unix en unix2dos kunnen UTF-8-gecodeerde bestanden omzetten, want UTF-8 is ontworpen op compatibiliteit met ASCII. @@ -568,10 +594,9 @@ UNICODE ISO- en 7-bits-conversie werken niet op UTF-16-bestanden. Byte-Order-Mark - Op Windows bevatten Unicode-tekstbestanden gewoonlijk een - Byte-Order-Mark (BOM), omdat veel Windows-programma's (inclusief - Kladblok) standaard een BOM toevoegen. Zie ook - . + On Windows Unicode text files typically have a Byte Order Mark (BOM), + because many Windows programs (including Notepad) add BOMs by default. + See also . Op Unix hebben Unicode-tekstbestanden meestal geen BOM. Er wordt aangenomen dat de codering van tekstbestanden gelijk is aan de @@ -625,10 +650,9 @@ UNICODE unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > uit.txt GB18030 - GB18030 is een standaard van de Chinese overheid. Een subset van de - GB18030-standaard is officieel verplicht voor alle softwareproducten die - in China verkocht worden. Zie ook - . + GB18030 is a Chinese government standard. A mandatory subset of the + GB18030 standard is officially required for all software products sold + in China. See also . GB18030 is volledig compatibel met Unicode, en kan als een Unicodetransformatie beschouwd worden. Net als UTF-8 is GB18030 @@ -745,24 +769,24 @@ LOKALISATIE export LANG=en_US.iso88591 Engels, VS, Latin-1-codering export LANG=en_GB.UTF-8 Engels, GB, UTF-8-codering - Voor een complete lijst van taal- en landcodes zie de - gettext-handleiding: - + For a complete list of language and country codes see the gettext + manual: + Op Unix-systemen kunt u de opdracht locale(1) gebruiken om specifieke taalregio-informatie te verkrijgen. LANGUAGE - Met de omgevingsvariabele LANGUAGE kunt u een prioriteitenlijst - specificeren van talen, gescheiden door dubbele punten. Dos2unix - geeft voorrang aan LANGUAGE boven LANG. Bijvoorbeeld, eerst - Nederlands en dan Duits: "LANGUAGE=nl:de". U moet eerst lokalisatie - in werking stellen, door het instellen van LANG (of LC_ALL) op een - waarde ongelijk aan "C", voordat u een talen-prioriteitenlijst kunt - gebruiken via de variabele LANGUAGE. Zie ook de gettext-handleiding: - + With the LANGUAGE environment variable you can specify a priority + list of languages, separated by colons. Dos2unix gives preference to + LANGUAGE over LANG. For instance, first Dutch and then German: + "LANGUAGE=nl:de". You have to first enable localization, by setting + LANG (or LC_ALL) to a value other than "C", before you can use a + language priority list through the LANGUAGE variable. See also the + gettext manual: + Als u een taal kiest die niet beschikbaar is, worden de standaard Engelse berichten gebruikt. @@ -787,13 +811,13 @@ AFSLUITWAARDE wanneer verkeerde opties worden gegeven. STANDAARDEN - + - + - + - + AUTEURS Benjamin Lin - , Bernd Johannes Wuebben @@ -801,9 +825,9 @@ AUTEURS extra regeleindes) - , Erwin Waterlander - (beheerder) - Projectpagina: + Project page: - SourceForge-pagina: + SourceForge page: ZIE OOK file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/dos2unix/man/pl/man1/dos2unix.1 b/dos2unix/man/pl/man1/dos2unix.1 index 6e4fba9..170273d 100644 --- a/dos2unix/man/pl/man1/dos2unix.1 +++ b/dos2unix/man/pl/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2023-08-29" "dos2unix" "2023-08-29" +.TH dos2unix 1 "2024-01-22" "dos2unix" "2024-01-22" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -122,7 +122,7 @@ Zezwolenie na zmianę właściciela w trybie starego pliku. W przypadku użycia tej opcji, konwersja nie zostanie przerwana, jeśli nie ma możliwości zachowania właściciela i/lub grupy oryginalnego pliku w trybie starego pliku. Konwersja będzie kontynuowana, a przekonwertowany plik będzie miał tego samego właściciela, jakiego by miał w trybie nowego pliku. P. także opcje \f(CW\*(C`\-o\*(C'\fR i \f(CW\*(C`\-n\*(C'\fR. Opcja jest dostępna tylko wtedy, gdy dos2unix ma obsługę zachowywania użytkownika i grupy plików. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" -Konwersja tylko znaków końca linii. Jest to domyślny tryb konwersji. +Domyślny tryb konwersji. Więcej w sekcji \s-1TRYBY KONWERSJI.\s0 .IP "\fB\-iso\fR" 4 .IX Item "-iso" Konwersja między zestawami znaków \s-1DOS\s0 i \s-1ISO\-8859\-1.\s0 Więcej w sekcji \s-1TRYBY KONWERSJI.\s0 @@ -224,7 +224,17 @@ Przykładowe wyjście: .Sp Uwaga: czasami plik binarny może być błędnie rozpoznany jako tekstowy. P. także opcja \f(CW\*(C`\-s\*(C'\fR. .Sp -Opcjonalnie można ustawić dodatkowe flagi, aby zmienić wyjście. Można dodać jedną lub więcej flag. +Jeśli dodatkowo użyta jest opcja \f(CW\*(C`\-e\*(C'\fR lub \f(CW\*(C`\-\-add\-eol\*(C'\fR, wypisywany jest także rodzaj końca linii z ostatniej linii, lub \f(CW\*(C`noeol\*(C'\fR, jeśli nie ma żadnego. +.Sp +Przykładowe wyjście: +.Sp +.Vb 5 +\& 6 0 0 no_bom text dos dos.txt +\& 0 6 0 no_bom text unix unix.txt +\& 0 0 6 no_bom text mac mac.txt +\& 1 0 0 no_bom text noeol noeol_dos.txt +\&Opcjonalnie można ustawić dodatkowe flagi, aby zmienić wyjście. Można dodać jedną lub więcej flag. +.Ve .RS 4 .IP "\fB0\fR" 4 .IX Item "0" @@ -244,11 +254,16 @@ Wypisanie znacznika \s-1BOM.\s0 .IP "\fBt\fR" 4 .IX Item "t" Wypisanie, czy plik jest tekstowy, czy binarny. +.IP "\fBe\fR" 4 +.IX Item "e" +Wypisanie rodzaju końca wiersza w ostatnim wierszu, lub \f(CW\*(C`noeol\*(C'\fR, jeśli nie ma żadnego. .IP "\fBc\fR" 4 .IX Item "c" Wypisanie tylko plików, które zostałyby przekonwertowane. .Sp Z flagą \f(CW\*(C`c\*(C'\fR dos2unix wypisze tylko pliki zawierające DOS-owe końce linii, a unix2dos wypisze tylko nazwy plików zawierających uniksowe końce linii. +.Sp +Jeśli dodatkowo użyta jest opcja \f(CW\*(C`\-e\*(C'\fR lub \f(CW\*(C`\-\-add\-eol\*(C'\fR, wypisywane są także pliki bez zakończenia ostatniej linii. .IP "\fBh\fR" 4 .IX Item "h" Wypisanie nagłówka. @@ -290,6 +305,12 @@ Wypisanie listy plików zawierających uniksowe końce linii: \& unix2dos \-ic *.txt .Ve .Sp +Wypisanie listy plików zawierających DOS-owe końce linii lub bez znaku końca w ostatniej linii: +.Sp +.Vb 1 +\& dos2unix \-e \-ic *.txt +.Ve +.Sp Konwersja tylko plików mających DOS-owe końce linii, pozostawienie pozostałych bez zmian: .Sp .Vb 1 @@ -410,7 +431,7 @@ Pozostawienie dowiązań symbolicznych i celów bez zmian (domyślne). Wyświetlenie informacji o wersji i zakończenie. .SH "TRYB MAC" .IX Header "TRYB MAC" -W zwykłym trybie znaki końca linii są konwertowane z DOS-a do Uniksa i odwrotnie. Znaki końca linii systemu Mac nie są konwertowane. +Domyślnie znaki końca linii są konwertowane z DOS-a do Uniksa i odwrotnie. Znaki końca linii systemu Mac nie są konwertowane. .PP W trybie Mac znaki końca linii są konwertowane z formatu Maca do Uniksa i odwrotnie. Znaki końca linii systemu \s-1DOS\s0 nie są zmieniane. .PP @@ -419,9 +440,9 @@ Aby uruchomić program w trybie Mac, należy użyć opcji linii poleceń \f(CW\* .IX Header "TRYBY KONWERSJI" .IP "\fBascii\fR" 4 .IX Item "ascii" -W trybie \f(CW\*(C`ascii\*(C'\fR konwertowane są tylko końce linii. Jest to domyślny tryb konwersji. +To jest domyślny tryb konwersji. Służy do konwersji plików kodowanych \s-1ASCII\s0 lub zgodnie z \s-1ASCII,\s0 np. \s-1UTF\-8.\s0 Włączenie trybu \fBascii\fR wyłącza tryby \fB7bit\fR i \fBiso\fR. .Sp -Mimo że nazwa tego trybu to \s-1ASCII,\s0 które jest standardem 7\-bitowym, jest to tryb 8\-bitowy. Należy zawsze używać tego trybu przy konwersji plików Unicode \s-1UTF\-8.\s0 +Jeśli dos2unix ma obsługę \s-1UTF\-16,\s0 pliki kodowane \s-1UTF\-16\s0 są konwertowane do bieżącego kodowania w systamach zgodnych z \s-1POSIX\s0 lub do \s-1UTF\-8\s0 na Windows. Włączenie trybu \fBascii\fR wyłącza opcję zachowywania kodowania \s-1UTF\-16\s0 (\f(CW\*(C`\-u\*(C'\fR) oraz opcje zakładające wejście \s-1UTF\-16\s0 (\f(CW\*(C`\-ul\*(C'\fR oraz \f(CW\*(C`\-ub\*(C'\fR). Aby sprawdzić, czy dos2unix ma obsługę \s-1UTF\-16,\s0 można wywołać \f(CW\*(C`dos2unix \-V\*(C'\fR. Więcej w sekcji \s-1UNICODE.\s0 .IP "\fB7bit\fR" 4 .IX Item "7bit" W tym trybie wszystkie znaki 8\-bitowe spoza \s-1ASCII\s0 (o wartościach od 128 do 255) są konwertowane do przestrzeni 7\-bitowej. @@ -491,7 +512,7 @@ Więcej pod adresem oraz . +W systemie Windows pliki tekstowe zwykle zawierają znacznik \s-1BOM\s0 (Byte Order Mark), ponieważ wiele programów dla Windows (w tym Notepad) dodaje domyślnie znaczniki \s-1BOM.\s0 Więcej informacji można znaleźć pod adresem . .PP Pod Uniksem pliki Unicode zwykle nie mają znacznika \s-1BOM.\s0 Pliki tekstowe są traktowane jako kodowane zgodnie z kodowaniem znaków ustawionej lokalizacji. .PP @@ -555,7 +576,7 @@ Konwersja z uniksowego \s-1UTF\-8\s0 do \s-1UTF\-16\s0 dla Windows: .Ve .SH "GB18030" .IX Header "GB18030" -\&\s-1GB18030\s0 to standard urzędowy w Chinach. Obowiązkowy podzbiór standardu \s-1GB18030\s0 jest oficjalnym wymaganiem każdego oprogramowania sprzedawanego w Chinach. Więcej pod adresem . +\&\s-1GB18030\s0 to standard urzędowy w Chinach. Obowiązkowy podzbiór standardu \s-1GB18030\s0 jest oficjalnym wymaganiem każdego oprogramowania sprzedawanego w Chinach. Więcej pod adresem . .PP \&\s-1GB18030\s0 jest w pełni zgodny z Unicode i może być uważany za format transformacji unikodu. Podobnie jak \s-1UTF\-8, GB18030\s0 jest zgodny z \s-1ASCII.\s0 Jest także zgodny ze stroną kodową Windows 936, znaną też jako \s-1GBK.\s0 .PP @@ -680,12 +701,12 @@ Główny język wybiera się zmienną środowiskową \s-1LANG.\s0 Zmienna \s-1LA \& export LANG=en_GB.UTF\-8 angielski, Wlk. Brytania, kodowanie UTF\-8 .Ve .Sp -Pełną listę kodów języków i krajów można znaleźć w podręczniku do gettexta: +Pełną listę kodów języków i krajów można znaleźć w podręczniku do gettexta: .Sp W systemach uniksowych do uzyskania informacji dotyczących lokalizacji można użyć polecenia \fBlocale\fR\|(1). .IP "\fB\s-1LANGUAGE\s0\fR" 4 .IX Item "LANGUAGE" -Przy użyciu zmiennej środowiskowej \s-1LANGUAGE\s0 można określić listę języków wg priorytetu, oddzielonych dwukropkami. Dos2unix przyjmuje pierwszeństwo zmiennej \s-1LANGUAGE\s0 nad \s-1LANG.\s0 Na przykład, najpierw holenderski, następnie niemiecki: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. Aby skorzystać z listy wg priorytetów ze zmiennej \s-1LANGUAGE,\s0 trzeba najpierw włączyć lokalizację przez ustawienie zmiennej \s-1LANG\s0 (lub \s-1LC_ALL\s0) na wartość inną niż \*(L"C\*(R". Więcej informacji znajduje się w podręczniku do gettexta: +Przy użyciu zmiennej środowiskowej \s-1LANGUAGE\s0 można określić listę języków wg priorytetu, oddzielonych dwukropkami. Dos2unix przyjmuje pierwszeństwo zmiennej \s-1LANGUAGE\s0 nad \s-1LANG.\s0 Na przykład, najpierw holenderski, następnie niemiecki: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. Aby skorzystać z listy wg priorytetów ze zmiennej \s-1LANGUAGE,\s0 trzeba najpierw włączyć lokalizację przez ustawienie zmiennej \s-1LANG\s0 (lub \s-1LC_ALL\s0) na wartość inną niż \*(L"C\*(R". Więcej informacji znajduje się w podręczniku do gettexta: .Sp W przypadku wybrania niedostępnego języka, otrzymamy standardowe, angielskie komunikaty. .IP "\fB\s-1DOS2UNIX_LOCALEDIR\s0\fR" 4 @@ -704,20 +725,20 @@ W przypadku powodzenia zwracane jest zero. Jeśli wystąpi błąd systemowy, zwr Wartość zwracana w trybie cichym to zawsze zero, z wyjątkiem sytuacji podania błędnych opcji linii poleceń. .SH "STANDARDY" .IX Header "STANDARDY" - + .PP - + .PP - + .PP - + .SH "AUTORZY" .IX Header "AUTORZY" Benjamin Lin ; Bernd Johannes Wuebben (tryb mac2unix) ; Christian Wurll (dodawanie dodatkowej nowej linii) ; Erwin Waterlander (prowadzący) .PP -Strona projektu: +Strona projektu: .PP -Strona SourceForge: +Strona SourceForge: .SH "ZOBACZ TAKŻE" .IX Header "ZOBACZ TAKŻE" \&\fBfile\fR\|(1) \fBfind\fR\|(1) \fBiconv\fR\|(1) \fBlocale\fR\|(1) \fBxargs\fR\|(1) diff --git a/dos2unix/man/pl/man1/dos2unix.htm b/dos2unix/man/pl/man1/dos2unix.htm index c3c715d..f280097 100644 --- a/dos2unix/man/pl/man1/dos2unix.htm +++ b/dos2unix/man/pl/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.5.1 - konwerter formatu plików tekstowych między systemami DOS/Mac a Uniksem +dos2unix 7.5.2 - konwerter formatu plików tekstowych między systemami DOS/Mac a Uniksem @@ -89,7 +89,7 @@

OPCJE

-ascii
-

Konwersja tylko znaków końca linii. Jest to domyślny tryb konwersji.

+

Domyślny tryb konwersji. Więcej w sekcji TRYBY KONWERSJI.

-iso
@@ -246,7 +246,15 @@

OPCJE

Uwaga: czasami plik binarny może być błędnie rozpoznany jako tekstowy. P. także opcja -s.

-

Opcjonalnie można ustawić dodatkowe flagi, aby zmienić wyjście. Można dodać jedną lub więcej flag.

+

Jeśli dodatkowo użyta jest opcja -e lub --add-eol, wypisywany jest także rodzaj końca linii z ostatniej linii, lub noeol, jeśli nie ma żadnego.

+ +

Przykładowe wyjście:

+ +
     6       0       0  no_bom    text   dos     dos.txt
+     0       6       0  no_bom    text   unix    unix.txt
+     0       0       6  no_bom    text   mac     mac.txt
+     1       0       0  no_bom    text   noeol   noeol_dos.txt
+Opcjonalnie można ustawić dodatkowe flagi, aby zmienić wyjście. Można dodać jedną lub więcej flag.
@@ -285,6 +293,12 @@

OPCJE

Wypisanie, czy plik jest tekstowy, czy binarny.

+ +
e
+
+ +

Wypisanie rodzaju końca wiersza w ostatnim wierszu, lub noeol, jeśli nie ma żadnego.

+
c
@@ -293,6 +307,8 @@

OPCJE

Z flagą c dos2unix wypisze tylko pliki zawierające DOS-owe końce linii, a unix2dos wypisze tylko nazwy plików zawierających uniksowe końce linii.

+

Jeśli dodatkowo użyta jest opcja -e lub --add-eol, wypisywane są także pliki bez zakończenia ostatniej linii.

+
h
@@ -330,6 +346,10 @@

OPCJE

unix2dos -ic *.txt
+

Wypisanie listy plików zawierających DOS-owe końce linii lub bez znaku końca w ostatniej linii:

+ +
dos2unix -e -ic *.txt
+

Konwersja tylko plików mających DOS-owe końce linii, pozostawienie pozostałych bez zmian:

dos2unix -ic0 *.txt | xargs -0 dos2unix
@@ -503,7 +523,7 @@

OPCJE

TRYB MAC

-

W zwykłym trybie znaki końca linii są konwertowane z DOS-a do Uniksa i odwrotnie. Znaki końca linii systemu Mac nie są konwertowane.

+

Domyślnie znaki końca linii są konwertowane z DOS-a do Uniksa i odwrotnie. Znaki końca linii systemu Mac nie są konwertowane.

W trybie Mac znaki końca linii są konwertowane z formatu Maca do Uniksa i odwrotnie. Znaki końca linii systemu DOS nie są zmieniane.

@@ -516,9 +536,9 @@

TRYBY KONWERSJI

ascii
-

W trybie ascii konwertowane są tylko końce linii. Jest to domyślny tryb konwersji.

+

To jest domyślny tryb konwersji. Służy do konwersji plików kodowanych ASCII lub zgodnie z ASCII, np. UTF-8. Włączenie trybu ascii wyłącza tryby 7bit i iso.

-

Mimo że nazwa tego trybu to ASCII, które jest standardem 7-bitowym, jest to tryb 8-bitowy. Należy zawsze używać tego trybu przy konwersji plików Unicode UTF-8.

+

Jeśli dos2unix ma obsługę UTF-16, pliki kodowane UTF-16 są konwertowane do bieżącego kodowania w systamach zgodnych z POSIX lub do UTF-8 na Windows. Włączenie trybu ascii wyłącza opcję zachowywania kodowania UTF-16 (-u) oraz opcje zakładające wejście UTF-16 (-ul oraz -ub). Aby sprawdzić, czy dos2unix ma obsługę UTF-16, można wywołać dos2unix -V. Więcej w sekcji UNICODE.

7bit
@@ -583,7 +603,7 @@

Kodowania

Konwersje

-

Pliki tekstowe Unicode mogą mieć znaki końca linii systemu DOS, Unix lub Mac, podobnie jak zwykłe pliki tekstowe.

+

Pliki tekstowe Unicode mogą mieć znaki końca linii systemu DOS, Unix lub Mac, podobnie jak pliki tekstowe ASCII.

Wszystkie wersje dos2unix i unix2dos potrafią konwertować pliki kodowane UTF-8, ponieważ UTF-8 jest wstecznie zgodne z ASCII.

@@ -603,7 +623,7 @@

Konwersje

Znacznik BOM

-

W systemie Windows pliki tekstowe zwykle zawierają znacznik BOM (Byte Order Mark), ponieważ wiele programów dla Windows (w tym Notepad) dodaje domyślnie znaczniki BOM. Więcej informacji można znaleźć pod adresem http://pl.wikipedia.org/wiki/BOM_(informatyka).

+

W systemie Windows pliki tekstowe zwykle zawierają znacznik BOM (Byte Order Mark), ponieważ wiele programów dla Windows (w tym Notepad) dodaje domyślnie znaczniki BOM. Więcej informacji można znaleźć pod adresem https://pl.wikipedia.org/wiki/BOM_(informatyka).

Pod Uniksem pliki Unicode zwykle nie mają znacznika BOM. Pliki tekstowe są traktowane jako kodowane zgodnie z kodowaniem znaków ustawionej lokalizacji.

@@ -643,7 +663,7 @@

Przykłady Unicode

GB18030

-

GB18030 to standard urzędowy w Chinach. Obowiązkowy podzbiór standardu GB18030 jest oficjalnym wymaganiem każdego oprogramowania sprzedawanego w Chinach. Więcej pod adresem http://en.wikipedia.org/wiki/GB_18030.

+

GB18030 to standard urzędowy w Chinach. Obowiązkowy podzbiór standardu GB18030 jest oficjalnym wymaganiem każdego oprogramowania sprzedawanego w Chinach. Więcej pod adresem https://en.wikipedia.org/wiki/GB_18030.

GB18030 jest w pełni zgodny z Unicode i może być uważany za format transformacji unikodu. Podobnie jak UTF-8, GB18030 jest zgodny z ASCII. Jest także zgodny ze stroną kodową Windows 936, znaną też jako GBK.

@@ -742,7 +762,7 @@

LOKALIZACJA

export LANG=en_US.iso88591 angielski, USA, kodowanie Latin-1 export LANG=en_GB.UTF-8 angielski, Wlk. Brytania, kodowanie UTF-8 -

Pełną listę kodów języków i krajów można znaleźć w podręczniku do gettexta: http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

+

Pełną listę kodów języków i krajów można znaleźć w podręczniku do gettexta: https://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

W systemach uniksowych do uzyskania informacji dotyczących lokalizacji można użyć polecenia locale(1).

@@ -750,7 +770,7 @@

LOKALIZACJA

LANGUAGE
-

Przy użyciu zmiennej środowiskowej LANGUAGE można określić listę języków wg priorytetu, oddzielonych dwukropkami. Dos2unix przyjmuje pierwszeństwo zmiennej LANGUAGE nad LANG. Na przykład, najpierw holenderski, następnie niemiecki: LANGUAGE=nl:de. Aby skorzystać z listy wg priorytetów ze zmiennej LANGUAGE, trzeba najpierw włączyć lokalizację przez ustawienie zmiennej LANG (lub LC_ALL) na wartość inną niż "C". Więcej informacji znajduje się w podręczniku do gettexta: http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

+

Przy użyciu zmiennej środowiskowej LANGUAGE można określić listę języków wg priorytetu, oddzielonych dwukropkami. Dos2unix przyjmuje pierwszeństwo zmiennej LANGUAGE nad LANG. Na przykład, najpierw holenderski, następnie niemiecki: LANGUAGE=nl:de. Aby skorzystać z listy wg priorytetów ze zmiennej LANGUAGE, trzeba najpierw włączyć lokalizację przez ustawienie zmiennej LANG (lub LC_ALL) na wartość inną niż "C". Więcej informacji znajduje się w podręczniku do gettexta: https://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

W przypadku wybrania niedostępnego języka, otrzymamy standardowe, angielskie komunikaty.

@@ -775,21 +795,21 @@

WARTOŚĆ ZWRACANA

STANDARDY

-

http://pl.wikipedia.org/wiki/Plik_tekstowy

+

https://pl.wikipedia.org/wiki/Plik_tekstowy

-

http://en.wikipedia.org/wiki/Carriage_return

+

https://en.wikipedia.org/wiki/Carriage_return

-

http://pl.wikipedia.org/wiki/End-of-line

+

https://pl.wikipedia.org/wiki/Koniec_linii

-

http://pl.wikipedia.org/wiki/Unicode

+

https://pl.wikipedia.org/wiki/Unicode

AUTORZY

Benjamin Lin <blin@socs.uts.edu.au>; Bernd Johannes Wuebben (tryb mac2unix) <wuebben@kde.org>; Christian Wurll (dodawanie dodatkowej nowej linii) <wurll@ira.uka.de>; Erwin Waterlander <waterlan@xs4all.nl> (prowadzący)

-

Strona projektu: http://waterlan.home.xs4all.nl/dos2unix.html

+

Strona projektu: https://waterlan.home.xs4all.nl/dos2unix.html

-

Strona SourceForge: http://sourceforge.net/projects/dos2unix/

+

Strona SourceForge: https://sourceforge.net/projects/dos2unix/

ZOBACZ TAKŻE

diff --git a/dos2unix/man/pl/man1/dos2unix.pod b/dos2unix/man/pl/man1/dos2unix.pod index c27a0c8..b38d1b3 100644 --- a/dos2unix/man/pl/man1/dos2unix.pod +++ b/dos2unix/man/pl/man1/dos2unix.pod @@ -63,7 +63,7 @@ W przypadku użycia tej opcji, konwersja nie zostanie przerwana, jeśli nie ma m =item B<-ascii> -Konwersja tylko znaków końca linii. Jest to domyślny tryb konwersji. +Domyślny tryb konwersji. Więcej w sekcji TRYBY KONWERSJI. =item B<-iso> @@ -188,6 +188,14 @@ Przykładowe wyjście: Uwaga: czasami plik binarny może być błędnie rozpoznany jako tekstowy. P. także opcja C<-s>. +Jeśli dodatkowo użyta jest opcja C<-e> lub C<--add-eol>, wypisywany jest także rodzaj końca linii z ostatniej linii, lub C, jeśli nie ma żadnego. + +Przykładowe wyjście: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt Opcjonalnie można ustawić dodatkowe flagi, aby zmienić wyjście. Można dodać jedną lub więcej flag. =over 4 @@ -216,12 +224,18 @@ Wypisanie znacznika BOM. Wypisanie, czy plik jest tekstowy, czy binarny. +=item B + +Wypisanie rodzaju końca wiersza w ostatnim wierszu, lub C, jeśli nie ma żadnego. + =item B Wypisanie tylko plików, które zostałyby przekonwertowane. Z flagą C dos2unix wypisze tylko pliki zawierające DOS-owe końce linii, a unix2dos wypisze tylko nazwy plików zawierających uniksowe końce linii. +Jeśli dodatkowo użyta jest opcja C<-e> lub C<--add-eol>, wypisywane są także pliki bez zakończenia ostatniej linii. + =item B Wypisanie nagłówka. @@ -254,6 +268,10 @@ Wypisanie listy plików zawierających uniksowe końce linii: unix2dos -ic *.txt +Wypisanie listy plików zawierających DOS-owe końce linii lub bez znaku końca w ostatniej linii: + + dos2unix -e -ic *.txt + Konwersja tylko plików mających DOS-owe końce linii, pozostawienie pozostałych bez zmian: dos2unix -ic0 *.txt | xargs -0 dos2unix @@ -388,7 +406,7 @@ Wyświetlenie informacji o wersji i zakończenie. =head1 TRYB MAC -W zwykłym trybie znaki końca linii są konwertowane z DOS-a do Uniksa i odwrotnie. Znaki końca linii systemu Mac nie są konwertowane. +Domyślnie znaki końca linii są konwertowane z DOS-a do Uniksa i odwrotnie. Znaki końca linii systemu Mac nie są konwertowane. W trybie Mac znaki końca linii są konwertowane z formatu Maca do Uniksa i odwrotnie. Znaki końca linii systemu DOS nie są zmieniane. @@ -400,9 +418,9 @@ Aby uruchomić program w trybie Mac, należy użyć opcji linii poleceń C<-c ma =item B -W trybie C konwertowane są tylko końce linii. Jest to domyślny tryb konwersji. +To jest domyślny tryb konwersji. Służy do konwersji plików kodowanych ASCII lub zgodnie z ASCII, np. UTF-8. Włączenie trybu B wyłącza tryby B<7bit> i B. -Mimo że nazwa tego trybu to ASCII, które jest standardem 7-bitowym, jest to tryb 8-bitowy. Należy zawsze używać tego trybu przy konwersji plików Unicode UTF-8. +Jeśli dos2unix ma obsługę UTF-16, pliki kodowane UTF-16 są konwertowane do bieżącego kodowania w systamach zgodnych z POSIX lub do UTF-8 na Windows. Włączenie trybu B wyłącza opcję zachowywania kodowania UTF-16 (C<-u>) oraz opcje zakładające wejście UTF-16 (C<-ul> oraz C<-ub>). Aby sprawdzić, czy dos2unix ma obsługę UTF-16, można wywołać C. Więcej w sekcji UNICODE. =item B<7bit> @@ -462,7 +480,7 @@ Istnieją różne kodowania Unicode. Pod Uniksem i Linuksem pliki Unicode są zw =head2 Konwersje -Pliki tekstowe Unicode mogą mieć znaki końca linii systemu DOS, Unix lub Mac, podobnie jak zwykłe pliki tekstowe. +Pliki tekstowe Unicode mogą mieć znaki końca linii systemu DOS, Unix lub Mac, podobnie jak pliki tekstowe ASCII. Wszystkie wersje dos2unix i unix2dos potrafią konwertować pliki kodowane UTF-8, ponieważ UTF-8 jest wstecznie zgodne z ASCII. @@ -482,7 +500,7 @@ Tryby konwersji ISO i 7-bit nie działają na plikach UTF-16. =head2 Znacznik BOM -W systemie Windows pliki tekstowe zwykle zawierają znacznik BOM (Byte Order Mark), ponieważ wiele programów dla Windows (w tym Notepad) dodaje domyślnie znaczniki BOM. Więcej informacji można znaleźć pod adresem L. +W systemie Windows pliki tekstowe zwykle zawierają znacznik BOM (Byte Order Mark), ponieważ wiele programów dla Windows (w tym Notepad) dodaje domyślnie znaczniki BOM. Więcej informacji można znaleźć pod adresem L. Pod Uniksem pliki Unicode zwykle nie mają znacznika BOM. Pliki tekstowe są traktowane jako kodowane zgodnie z kodowaniem znaków ustawionej lokalizacji. @@ -522,7 +540,7 @@ Konwersja z uniksowego UTF-8 do UTF-16 dla Windows: =head1 GB18030 -GB18030 to standard urzędowy w Chinach. Obowiązkowy podzbiór standardu GB18030 jest oficjalnym wymaganiem każdego oprogramowania sprzedawanego w Chinach. Więcej pod adresem L. +GB18030 to standard urzędowy w Chinach. Obowiązkowy podzbiór standardu GB18030 jest oficjalnym wymaganiem każdego oprogramowania sprzedawanego w Chinach. Więcej pod adresem L. GB18030 jest w pełni zgodny z Unicode i może być uważany za format transformacji unikodu. Podobnie jak UTF-8, GB18030 jest zgodny z ASCII. Jest także zgodny ze stroną kodową Windows 936, znaną też jako GBK. @@ -622,13 +640,13 @@ Główny język wybiera się zmienną środowiskową LANG. Zmienna LANG składa export LANG=en_US.iso88591 angielski, USA, kodowanie Latin-1 export LANG=en_GB.UTF-8 angielski, Wlk. Brytania, kodowanie UTF-8 -Pełną listę kodów języków i krajów można znaleźć w podręczniku do gettexta: L +Pełną listę kodów języków i krajów można znaleźć w podręczniku do gettexta: L W systemach uniksowych do uzyskania informacji dotyczących lokalizacji można użyć polecenia locale(1). =item B -Przy użyciu zmiennej środowiskowej LANGUAGE można określić listę języków wg priorytetu, oddzielonych dwukropkami. Dos2unix przyjmuje pierwszeństwo zmiennej LANGUAGE nad LANG. Na przykład, najpierw holenderski, następnie niemiecki: C. Aby skorzystać z listy wg priorytetów ze zmiennej LANGUAGE, trzeba najpierw włączyć lokalizację przez ustawienie zmiennej LANG (lub LC_ALL) na wartość inną niż "C". Więcej informacji znajduje się w podręczniku do gettexta: L +Przy użyciu zmiennej środowiskowej LANGUAGE można określić listę języków wg priorytetu, oddzielonych dwukropkami. Dos2unix przyjmuje pierwszeństwo zmiennej LANGUAGE nad LANG. Na przykład, najpierw holenderski, następnie niemiecki: C. Aby skorzystać z listy wg priorytetów ze zmiennej LANGUAGE, trzeba najpierw włączyć lokalizację przez ustawienie zmiennej LANG (lub LC_ALL) na wartość inną niż "C". Więcej informacji znajduje się w podręczniku do gettexta: L W przypadku wybrania niedostępnego języka, otrzymamy standardowe, angielskie komunikaty. @@ -654,21 +672,21 @@ Wartość zwracana w trybie cichym to zawsze zero, z wyjątkiem sytuacji podania =head1 STANDARDY -L +L -L +L -L +L -L +L =head1 AUTORZY Benjamin Lin ; Bernd Johannes Wuebben (tryb mac2unix) ; Christian Wurll (dodawanie dodatkowej nowej linii) ; Erwin Waterlander (prowadzący) -Strona projektu: L +Strona projektu: L -Strona SourceForge: L +Strona SourceForge: L =head1 ZOBACZ TAKŻE diff --git a/dos2unix/man/pl/man1/dos2unix.txt b/dos2unix/man/pl/man1/dos2unix.txt index 31edd55..68e1053 100644 --- a/dos2unix/man/pl/man1/dos2unix.txt +++ b/dos2unix/man/pl/man1/dos2unix.txt @@ -66,7 +66,7 @@ OPCJE obsługę zachowywania użytkownika i grupy plików. -ascii - Konwersja tylko znaków końca linii. Jest to domyślny tryb konwersji. + Domyślny tryb konwersji. Więcej w sekcji TRYBY KONWERSJI. -iso Konwersja między zestawami znaków DOS i ISO-8859-1. Więcej w sekcji @@ -219,8 +219,17 @@ OPCJE Uwaga: czasami plik binarny może być błędnie rozpoznany jako tekstowy. P. także opcja "-s". - Opcjonalnie można ustawić dodatkowe flagi, aby zmienić wyjście. - Można dodać jedną lub więcej flag. + Jeśli dodatkowo użyta jest opcja "-e" lub "--add-eol", wypisywany + jest także rodzaj końca linii z ostatniej linii, lub "noeol", jeśli + nie ma żadnego. + + Przykładowe wyjście: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Opcjonalnie można ustawić dodatkowe flagi, aby zmienić wyjście. Można dodać jedną lub więcej flag. 0 Wypisanie wierszy informacji o pliku zakończonych znakiem NUL zamiast znaku nowej linii. Pozwala to na poprawną interpretację @@ -238,12 +247,18 @@ OPCJE t Wypisanie, czy plik jest tekstowy, czy binarny. + e Wypisanie rodzaju końca wiersza w ostatnim wierszu, lub "noeol", + jeśli nie ma żadnego. + c Wypisanie tylko plików, które zostałyby przekonwertowane. Z flagą "c" dos2unix wypisze tylko pliki zawierające DOS-owe końce linii, a unix2dos wypisze tylko nazwy plików zawierających uniksowe końce linii. + Jeśli dodatkowo użyta jest opcja "-e" lub "--add-eol", + wypisywane są także pliki bez zakończenia ostatniej linii. + h Wypisanie nagłówka. p Wyświetlanie nazw plików bez ścieżki. @@ -270,6 +285,11 @@ OPCJE unix2dos -ic *.txt + Wypisanie listy plików zawierających DOS-owe końce linii lub bez + znaku końca w ostatniej linii: + + dos2unix -e -ic *.txt + Konwersja tylko plików mających DOS-owe końce linii, pozostawienie pozostałych bez zmian: @@ -442,7 +462,7 @@ OPCJE Wyświetlenie informacji o wersji i zakończenie. TRYB MAC - W zwykłym trybie znaki końca linii są konwertowane z DOS-a do Uniksa i + Domyślnie znaki końca linii są konwertowane z DOS-a do Uniksa i odwrotnie. Znaki końca linii systemu Mac nie są konwertowane. W trybie Mac znaki końca linii są konwertowane z formatu Maca do Uniksa @@ -453,12 +473,16 @@ TRYB MAC TRYBY KONWERSJI ascii - W trybie "ascii" konwertowane są tylko końce linii. Jest to domyślny - tryb konwersji. + To jest domyślny tryb konwersji. Służy do konwersji plików + kodowanych ASCII lub zgodnie z ASCII, np. UTF-8. Włączenie trybu + ascii wyłącza tryby 7bit i iso. - Mimo że nazwa tego trybu to ASCII, które jest standardem 7-bitowym, - jest to tryb 8-bitowy. Należy zawsze używać tego trybu przy - konwersji plików Unicode UTF-8. + Jeśli dos2unix ma obsługę UTF-16, pliki kodowane UTF-16 są + konwertowane do bieżącego kodowania w systamach zgodnych z POSIX lub + do UTF-8 na Windows. Włączenie trybu ascii wyłącza opcję + zachowywania kodowania UTF-16 ("-u") oraz opcje zakładające wejście + UTF-16 ("-ul" oraz "-ub"). Aby sprawdzić, czy dos2unix ma obsługę + UTF-16, można wywołać "dos2unix -V". Więcej w sekcji UNICODE. 7bit W tym trybie wszystkie znaki 8-bitowe spoza ASCII (o wartościach od @@ -532,7 +556,7 @@ UNICODE Konwersje Pliki tekstowe Unicode mogą mieć znaki końca linii systemu DOS, Unix lub - Mac, podobnie jak zwykłe pliki tekstowe. + Mac, podobnie jak pliki tekstowe ASCII. Wszystkie wersje dos2unix i unix2dos potrafią konwertować pliki kodowane UTF-8, ponieważ UTF-8 jest wstecznie zgodne z ASCII. @@ -569,7 +593,7 @@ UNICODE W systemie Windows pliki tekstowe zwykle zawierają znacznik BOM (Byte Order Mark), ponieważ wiele programów dla Windows (w tym Notepad) dodaje domyślnie znaczniki BOM. Więcej informacji można znaleźć pod adresem - . + . Pod Uniksem pliki Unicode zwykle nie mają znacznika BOM. Pliki tekstowe są traktowane jako kodowane zgodnie z kodowaniem znaków ustawionej @@ -624,7 +648,7 @@ UNICODE GB18030 GB18030 to standard urzędowy w Chinach. Obowiązkowy podzbiór standardu GB18030 jest oficjalnym wymaganiem każdego oprogramowania sprzedawanego - w Chinach. Więcej pod adresem . + w Chinach. Więcej pod adresem . GB18030 jest w pełni zgodny z Unicode i może być uważany za format transformacji unikodu. Podobnie jak UTF-8, GB18030 jest zgodny z ASCII. @@ -742,8 +766,8 @@ LOKALIZACJA Pełną listę kodów języków i krajów można znaleźć w podręczniku do gettexta: - + W systemach uniksowych do uzyskania informacji dotyczących lokalizacji można użyć polecenia locale(1). @@ -757,8 +781,8 @@ LOKALIZACJA lokalizację przez ustawienie zmiennej LANG (lub LC_ALL) na wartość inną niż "C". Więcej informacji znajduje się w podręczniku do gettexta: - + W przypadku wybrania niedostępnego języka, otrzymamy standardowe, angielskie komunikaty. @@ -783,13 +807,13 @@ WARTOŚĆ ZWRACANA podania błędnych opcji linii poleceń. STANDARDY - + - + - + - + AUTORZY Benjamin Lin ; Bernd Johannes Wuebben (tryb @@ -797,9 +821,9 @@ AUTORZY linii) ; Erwin Waterlander (prowadzący) - Strona projektu: + Strona projektu: - Strona SourceForge: + Strona SourceForge: ZOBACZ TAKŻE file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/dos2unix/man/pt_BR/man1/dos2unix.1 b/dos2unix/man/pt_BR/man1/dos2unix.1 index c35eaf2..52d9e89 100644 --- a/dos2unix/man/pt_BR/man1/dos2unix.1 +++ b/dos2unix/man/pt_BR/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2023-08-29" "dos2unix" "2023-08-29" +.TH dos2unix 1 "2024-01-22" "dos2unix" "2024-01-22" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -122,7 +122,7 @@ Permite alteração da propriedade de arquivo no modo de arquivo antigo. Quando esta opção é usada, a conversão não será abortada quando a propriedade do usuário e/ou do grupo do arquivo original não puder ser preservada no modo de arquivo antigo. A conversão continuará e o arquivo convertido receberá a mesma propriedade nova como se tivesse convertido no modo de novo arquivo. Veja também as opções \f(CW\*(C`\-o\*(C'\fR e \f(CW\*(C`\-n\*(C'\fR. Esta opção só está disponível se o dos2unix oferecer suporte a preservação da propriedade do usuário e do grupo de arquivos. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" -Converte apenas as quebras de linhas. Esse é o modo de conversão padrão. +Default conversion mode. See also section \s-1CONVERSION MODES.\s0 .IP "\fB\-iso\fR" 4 .IX Item "-iso" Conversão entre conjunto de caractere do \s-1DOS\s0 e \s-1ISO\-8859\-1.\s0 Veja também a seção \s-1MODOS DE\s0 CONVERSÃO. @@ -224,6 +224,17 @@ Exemplo de saída: .Sp Note que em algumas vezes um arquivo binário pode ser confundido com um arquivo texto. Veja também a opção \f(CW\*(C`\-s\*(C'\fR. .Sp +If in addition option \f(CW\*(C`\-e\*(C'\fR or \f(CW\*(C`\-\-add\-eol\*(C'\fR is used also the type of the line break of the last line is printed, or \f(CW\*(C`noeol\*(C'\fR if there is none. +.Sp +Exemplo de saída: +.Sp +.Vb 4 +\& 6 0 0 no_bom text dos dos.txt +\& 0 6 0 no_bom text unix unix.txt +\& 0 0 6 no_bom text mac mac.txt +\& 1 0 0 no_bom text noeol noeol_dos.txt +.Ve +.Sp Opcionalmente, opções extra podem ser definidas para alterar a saída. Uma ou mais opções podem ser adicionadas. .RS 4 .IP "\fB0\fR" 4 @@ -244,11 +255,16 @@ Exibe a marca de ordem de byte. .IP "\fBt\fR" 4 .IX Item "t" Exibe se arquivo é texto ou binário. +.IP "\fBe\fR" 4 +.IX Item "e" +Print the type of the line break of the last line, or \f(CW\*(C`noeol\*(C'\fR if there is none. .IP "\fBc\fR" 4 .IX Item "c" Exibe apenas os arquivos que seriam convertidos. .Sp Com a opção \f(CW\*(C`c\*(C'\fR, dos2unix vai exibir apenas os arquivos que contêm quebras de linha do \s-1DOS,\s0 unix2dos vai exibir apenas os nomes de arquivos que contêm quebras de linha do Unix. +.Sp +If in addition option \f(CW\*(C`\-e\*(C'\fR or \f(CW\*(C`\-\-add\-eol\*(C'\fR is used also the files that lack a line break on the last line will be printed. .IP "\fBh\fR" 4 .IX Item "h" Exibe um cabeçalho. @@ -290,6 +306,12 @@ Lista os arquivos que possuem quebras de linha do Unix: \& unix2dos \-ic *.txt .Ve .Sp +List the files that have \s-1DOS\s0 line breaks or lack a line break on the last line: +.Sp +.Vb 1 +\& dos2unix \-e \-ic *.txt +.Ve +.Sp Converte apenas arquivos que possuem quebras de linha do \s-1DOS\s0 e não altera outros arquivos: .Sp .Vb 1 @@ -410,7 +432,7 @@ Mentém ligações simbólicas e alvos inalterados (padrão). Exibe informação da versão e sai. .SH "MODO MAC" .IX Header "MODO MAC" -No modo normal, as quebras de linhas são convertidas de \s-1DOS\s0 para Unix e vice-versa. Quebras de linha do Mac não são convertidas. +By default line breaks are converted from \s-1DOS\s0 to Unix and vice versa. Mac line breaks are not converted. .PP No modo Mac, quebras de linha são convertidas de Mac para Unix e vice-versa. Quebras de linha do \s-1DOS\s0 não são alteradas. .PP @@ -419,9 +441,9 @@ Para executar no modo Mac, use a opção de linha de comando \f(CW\*(C`\-c mac\* .IX Header "MODOS DE CONVERSÃO" .IP "\fBascii\fR" 4 .IX Item "ascii" -No modo \f(CW\*(C`ascii\*(C'\fR, apenas as quebras de linha são convertidas. Esse é o modo de conversão padrão. +This is the default conversion mode. This mode is for converting \s-1ASCII\s0 and ASCII-compatible encoded files, like \s-1UTF\-8.\s0 Enabling \fBascii\fR mode disables \fB7bit\fR and \fBiso\fR mode. .Sp -Apesar do nome deste modo ser \s-1ASCII,\s0 o qual é um padrão de 7 bits, o modo é em verdade 8 bits. Sempre use este modo quando quiser converter arquivos Unicode \s-1UTF\-8.\s0 +If dos2unix has \s-1UTF\-16\s0 support, \s-1UTF\-16\s0 encoded files are converted to the current locale character encoding on \s-1POSIX\s0 systems and to \s-1UTF\-8\s0 on Windows. Enabling \fBascii\fR mode disables the option to keep \s-1UTF\-16\s0 encoding (\f(CW\*(C`\-u\*(C'\fR) and the options to assume \s-1UTF\-16\s0 input (\f(CW\*(C`\-ul\*(C'\fR and \f(CW\*(C`\-ub\*(C'\fR). To see if dos2unix has \s-1UTF\-16\s0 support type \f(CW\*(C`dos2unix \-V\*(C'\fR. See also section \s-1UNICODE.\s0 .IP "\fB7bit\fR" 4 .IX Item "7bit" Neste modo todos os caracteres não\-ASCII de 8 bits (com valores entre 128 e 255) são convertidos para um espaço de 7 bits. @@ -491,7 +513,7 @@ Veja também e . +On Windows Unicode text files typically have a Byte Order Mark (\s-1BOM\s0), because many Windows programs (including Notepad) add BOMs by default. See also . .PP No Unix, arquivos Unicode normalmente não têm \s-1BOM.\s0 Presume-se que arquivos texto são codificados na codificação de caracteres da localização. .PP @@ -555,7 +577,7 @@ Conversão de \s-1UTF\-8\s0 do Unix para \s-1UTF\-16\s0 do Windows: .Ve .SH "GB18030" .IX Header "GB18030" -\&\s-1GB18030\s0 é um padrão governamental chinês. Um subconjunto obrigatório do padrão \s-1GB18030\s0 é exigido oficialmente para todos os produtos de software vendidos na China. Veja também . +\&\s-1GB18030\s0 is a Chinese government standard. A mandatory subset of the \s-1GB18030\s0 standard is officially required for all software products sold in China. See also . .PP \&\s-1GB18030\s0 é completamente compatível com Unicode e pode ser considerado um formato de transformação de unicode. Assim como \s-1UTF\-8, GB18030\s0 é compatível com \s-1ASCII. GB18030\s0 também é compatível com a página de código 936 do Windows, também conhecida como \s-1GBK.\s0 .PP @@ -680,12 +702,12 @@ O idioma primário é selecionado com a variável de ambiente \s-1LANG. A\s0 var \& export LANG=en_GB.UTF\-8 Inglês, Reino Unido, codificação UTF\-8 .Ve .Sp -Para a lista completa de códigos de idioma e país, veja o manual do gettext: +For a complete list of language and country codes see the gettext manual: .Sp Nos sistemas Unix, você pode usar o comando \fBlocale\fR\|(1) para obter informação específica da localização. .IP "\fB\s-1LANGUAGE\s0\fR" 4 .IX Item "LANGUAGE" -Com a variável de ambiente \s-1LANGUAGE,\s0 você pode especificar uma lista de prioridades de idiomas, separada por vírgulas. Dos2unix fornece preferência à \s-1LANGUAGE\s0 sobre \s-1LANG.\s0 Por exemplo, primeiro holandês e, então, alemão: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. Você primeiro tem que habilitar localização, definindo \s-1LANG\s0 (ou \s-1LC_ALL\s0) para um valor diferente de \*(L"C\*(R", antes que você possa usar uma lista de prioridade de idioma por meio da variável \s-1LANGUAGE.\s0 Veja também o manual do gettext: +With the \s-1LANGUAGE\s0 environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to \s-1LANGUAGE\s0 over \s-1LANG.\s0 For instance, first Dutch and then German: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. You have to first enable localization, by setting \s-1LANG\s0 (or \s-1LC_ALL\s0) to a value other than \*(L"C\*(R", before you can use a language priority list through the \s-1LANGUAGE\s0 variable. See also the gettext manual: .Sp Se você selecionou um idioma que não está disponível, você vai terá as mensagens em inglês (padrão). .IP "\fB\s-1DOS2UNIX_LOCALEDIR\s0\fR" 4 @@ -704,20 +726,20 @@ No sucesso, zero é retornado. Quando um erro de sistema ocorre, o último erro O valor retornado é sempre zero no modo quieto, exceto quando opções de linha de comando erradas são usadas. .SH "PADRÕES" .IX Header "PADRÕES" - + .PP - + .PP - + .PP - + .SH "AUTORES" .IX Header "AUTORES" Benjamin Lin \- Bernd Johannes Wuebben (modo mac2unix) \- , Christian Wurll (adiciona nova linha extra) \- , Erwin Waterlander \- (mantenedor) .PP -Página do projeto: +Project page: .PP -Página do SourceForge: +SourceForge page: .SH "VEJA TAMBÉM" .IX Header "VEJA TAMBÉM" \&\fBfile\fR\|(1) \fBfind\fR\|(1) \fBiconv\fR\|(1) \fBlocale\fR\|(1) \fBxargs\fR\|(1) diff --git a/dos2unix/man/pt_BR/man1/dos2unix.htm b/dos2unix/man/pt_BR/man1/dos2unix.htm index 9a40c73..c9f64a1 100644 --- a/dos2unix/man/pt_BR/man1/dos2unix.htm +++ b/dos2unix/man/pt_BR/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.5.1 - Conversor de formato de arquivo texto de DOS/Mac para Unix e vice-versa +dos2unix 7.5.2 - Conversor de formato de arquivo texto de DOS/Mac para Unix e vice-versa @@ -89,7 +89,7 @@

OPÇÕES

-ascii
-

Converte apenas as quebras de linhas. Esse é o modo de conversão padrão.

+

Default conversion mode. See also section CONVERSION MODES.

-iso
@@ -246,6 +246,15 @@

OPÇÕES

Note que em algumas vezes um arquivo binário pode ser confundido com um arquivo texto. Veja também a opção -s.

+

If in addition option -e or --add-eol is used also the type of the line break of the last line is printed, or noeol if there is none.

+ +

Exemplo de saída:

+ +
6       0       0  no_bom    text   dos     dos.txt
+0       6       0  no_bom    text   unix    unix.txt
+0       0       6  no_bom    text   mac     mac.txt
+1       0       0  no_bom    text   noeol   noeol_dos.txt
+

Opcionalmente, opções extra podem ser definidas para alterar a saída. Uma ou mais opções podem ser adicionadas.

@@ -285,6 +294,12 @@

OPÇÕES

Exibe se arquivo é texto ou binário.

+ +
e
+
+ +

Print the type of the line break of the last line, or noeol if there is none.

+
c
@@ -293,6 +308,8 @@

OPÇÕES

Com a opção c, dos2unix vai exibir apenas os arquivos que contêm quebras de linha do DOS, unix2dos vai exibir apenas os nomes de arquivos que contêm quebras de linha do Unix.

+

If in addition option -e or --add-eol is used also the files that lack a line break on the last line will be printed.

+
h
@@ -330,6 +347,10 @@

OPÇÕES

unix2dos -ic *.txt
+

List the files that have DOS line breaks or lack a line break on the last line:

+ +
dos2unix -e -ic *.txt
+

Converte apenas arquivos que possuem quebras de linha do DOS e não altera outros arquivos:

dos2unix -ic0 *.txt | xargs -0 dos2unix
@@ -503,7 +524,7 @@

OPÇÕES

MODO MAC

-

No modo normal, as quebras de linhas são convertidas de DOS para Unix e vice-versa. Quebras de linha do Mac não são convertidas.

+

By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted.

No modo Mac, quebras de linha são convertidas de Mac para Unix e vice-versa. Quebras de linha do DOS não são alteradas.

@@ -516,9 +537,9 @@

MODOS DE CONVERSÃO

ascii
-

No modo ascii, apenas as quebras de linha são convertidas. Esse é o modo de conversão padrão.

+

This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling ascii mode disables 7bit and iso mode.

-

Apesar do nome deste modo ser ASCII, o qual é um padrão de 7 bits, o modo é em verdade 8 bits. Sempre use este modo quando quiser converter arquivos Unicode UTF-8.

+

If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling ascii mode disables the option to keep UTF-16 encoding (-u) and the options to assume UTF-16 input (-ul and -ub). To see if dos2unix has UTF-16 support type dos2unix -V. See also section UNICODE.

7bit
@@ -583,7 +604,7 @@

Codificações

Conversão

-

Arquivos texto em Unicode pode ter quebras de linha DOS, Unix ou Mac, como arquivos texto comuns.

+

Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files.

Todas as versões do dos2unix e unix2dos podem converter arquivos codificados em UTF-8 porque UTF-8 foi projetado para ter compatibilidade reversa com ASCII.

@@ -603,7 +624,7 @@

Conversão

Marca de ordem de byte

-

No Windows, arquivos Unicode normalmente têm uma Marca de Ordem de Byte (BOM), porque muitos programas (incluindo o Bloco de Notas) adiciona BOMs por padrão. Veja também http://en.wikipedia.org/wiki/Byte_order_mark.

+

On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also https://en.wikipedia.org/wiki/Byte_order_mark.

No Unix, arquivos Unicode normalmente não têm BOM. Presume-se que arquivos texto são codificados na codificação de caracteres da localização.

@@ -643,7 +664,7 @@

Exemplos de Unicode

GB18030

-

GB18030 é um padrão governamental chinês. Um subconjunto obrigatório do padrão GB18030 é exigido oficialmente para todos os produtos de software vendidos na China. Veja também http://en.wikipedia.org/wiki/GB_18030.

+

GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also https://en.wikipedia.org/wiki/GB_18030.

GB18030 é completamente compatível com Unicode e pode ser considerado um formato de transformação de unicode. Assim como UTF-8, GB18030 é compatível com ASCII. GB18030 também é compatível com a página de código 936 do Windows, também conhecida como GBK.

@@ -742,7 +763,7 @@

LOCALIZAÇÃO

export LANG=en_US.iso88591 Inglês, EUA, codificação Latin-1 export LANG=en_GB.UTF-8 Inglês, Reino Unido, codificação UTF-8 -

Para a lista completa de códigos de idioma e país, veja o manual do gettext: http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

+

For a complete list of language and country codes see the gettext manual: https://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

Nos sistemas Unix, você pode usar o comando locale(1) para obter informação específica da localização.

@@ -750,7 +771,7 @@

LOCALIZAÇÃO

LANGUAGE
-

Com a variável de ambiente LANGUAGE, você pode especificar uma lista de prioridades de idiomas, separada por vírgulas. Dos2unix fornece preferência à LANGUAGE sobre LANG. Por exemplo, primeiro holandês e, então, alemão: LANGUAGE=nl:de. Você primeiro tem que habilitar localização, definindo LANG (ou LC_ALL) para um valor diferente de "C", antes que você possa usar uma lista de prioridade de idioma por meio da variável LANGUAGE. Veja também o manual do gettext: http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

+

With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: LANGUAGE=nl:de. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than "C", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: https://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

Se você selecionou um idioma que não está disponível, você vai terá as mensagens em inglês (padrão).

@@ -775,21 +796,21 @@

VALOR RETORNADO

PADRÕES

-

http://en.wikipedia.org/wiki/Text_file

+

https://en.wikipedia.org/wiki/Text_file

-

http://en.wikipedia.org/wiki/Carriage_return

+

https://en.wikipedia.org/wiki/Carriage_return

-

http://en.wikipedia.org/wiki/Newline

+

https://en.wikipedia.org/wiki/Newline

-

http://en.wikipedia.org/wiki/Unicode

+

https://en.wikipedia.org/wiki/Unicode

AUTORES

Benjamin Lin - <blin@socs.uts.edu.au> Bernd Johannes Wuebben (modo mac2unix) - <wuebben@kde.org>, Christian Wurll (adiciona nova linha extra) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (mantenedor)

-

Página do projeto: http://waterlan.home.xs4all.nl/dos2unix.html

+

Project page: https://waterlan.home.xs4all.nl/dos2unix.html

-

Página do SourceForge: http://sourceforge.net/projects/dos2unix/

+

SourceForge page: https://sourceforge.net/projects/dos2unix/

VEJA TAMBÉM

diff --git a/dos2unix/man/pt_BR/man1/dos2unix.pod b/dos2unix/man/pt_BR/man1/dos2unix.pod index da0fc0d..8d0ee07 100644 --- a/dos2unix/man/pt_BR/man1/dos2unix.pod +++ b/dos2unix/man/pt_BR/man1/dos2unix.pod @@ -63,7 +63,7 @@ Quando esta opção é usada, a conversão não será abortada quando a propried =item B<-ascii> -Converte apenas as quebras de linhas. Esse é o modo de conversão padrão. +Default conversion mode. See also section CONVERSION MODES. =item B<-iso> @@ -188,6 +188,15 @@ Exemplo de saída: Note que em algumas vezes um arquivo binário pode ser confundido com um arquivo texto. Veja também a opção C<-s>. +If in addition option C<-e> or C<--add-eol> is used also the type of the line break of the last line is printed, or C if there is none. + +Exemplo de saída: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Opcionalmente, opções extra podem ser definidas para alterar a saída. Uma ou mais opções podem ser adicionadas. =over 4 @@ -216,12 +225,18 @@ Exibe a marca de ordem de byte. Exibe se arquivo é texto ou binário. +=item B + +Print the type of the line break of the last line, or C if there is none. + =item B Exibe apenas os arquivos que seriam convertidos. Com a opção C, dos2unix vai exibir apenas os arquivos que contêm quebras de linha do DOS, unix2dos vai exibir apenas os nomes de arquivos que contêm quebras de linha do Unix. +If in addition option C<-e> or C<--add-eol> is used also the files that lack a line break on the last line will be printed. + =item B Exibe um cabeçalho. @@ -254,6 +269,10 @@ Lista os arquivos que possuem quebras de linha do Unix: unix2dos -ic *.txt +List the files that have DOS line breaks or lack a line break on the last line: + + dos2unix -e -ic *.txt + Converte apenas arquivos que possuem quebras de linha do DOS e não altera outros arquivos: dos2unix -ic0 *.txt | xargs -0 dos2unix @@ -388,7 +407,7 @@ Exibe informação da versão e sai. =head1 MODO MAC -No modo normal, as quebras de linhas são convertidas de DOS para Unix e vice-versa. Quebras de linha do Mac não são convertidas. +By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted. No modo Mac, quebras de linha são convertidas de Mac para Unix e vice-versa. Quebras de linha do DOS não são alteradas. @@ -400,9 +419,9 @@ Para executar no modo Mac, use a opção de linha de comando C<-c mac> ou use os =item B -No modo C, apenas as quebras de linha são convertidas. Esse é o modo de conversão padrão. +This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling B mode disables B<7bit> and B mode. -Apesar do nome deste modo ser ASCII, o qual é um padrão de 7 bits, o modo é em verdade 8 bits. Sempre use este modo quando quiser converter arquivos Unicode UTF-8. +If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has UTF-16 support type C. See also section UNICODE. =item B<7bit> @@ -462,7 +481,7 @@ Exitem codificações Unicode diferentes. No Unix e no Linux, arquivos Unicode s =head2 Conversão -Arquivos texto em Unicode pode ter quebras de linha DOS, Unix ou Mac, como arquivos texto comuns. +Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files. Todas as versões do dos2unix e unix2dos podem converter arquivos codificados em UTF-8 porque UTF-8 foi projetado para ter compatibilidade reversa com ASCII. @@ -482,7 +501,7 @@ Modo de conversão ISO e 7 bits não funcionam em arquivos UTF-16. =head2 Marca de ordem de byte -No Windows, arquivos Unicode normalmente têm uma Marca de Ordem de Byte (BOM), porque muitos programas (incluindo o Bloco de Notas) adiciona BOMs por padrão. Veja também L. +On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L. No Unix, arquivos Unicode normalmente não têm BOM. Presume-se que arquivos texto são codificados na codificação de caracteres da localização. @@ -522,7 +541,7 @@ Conversão de UTF-8 do Unix para UTF-16 do Windows: =head1 GB18030 -GB18030 é um padrão governamental chinês. Um subconjunto obrigatório do padrão GB18030 é exigido oficialmente para todos os produtos de software vendidos na China. Veja também L. +GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L. GB18030 é completamente compatível com Unicode e pode ser considerado um formato de transformação de unicode. Assim como UTF-8, GB18030 é compatível com ASCII. GB18030 também é compatível com a página de código 936 do Windows, também conhecida como GBK. @@ -622,13 +641,13 @@ O idioma primário é selecionado com a variável de ambiente LANG. A variável export LANG=en_US.iso88591 Inglês, EUA, codificação Latin-1 export LANG=en_GB.UTF-8 Inglês, Reino Unido, codificação UTF-8 -Para a lista completa de códigos de idioma e país, veja o manual do gettext: L +For a complete list of language and country codes see the gettext manual: L Nos sistemas Unix, você pode usar o comando locale(1) para obter informação específica da localização. =item B -Com a variável de ambiente LANGUAGE, você pode especificar uma lista de prioridades de idiomas, separada por vírgulas. Dos2unix fornece preferência à LANGUAGE sobre LANG. Por exemplo, primeiro holandês e, então, alemão: C. Você primeiro tem que habilitar localização, definindo LANG (ou LC_ALL) para um valor diferente de "C", antes que você possa usar uma lista de prioridade de idioma por meio da variável LANGUAGE. Veja também o manual do gettext: L +With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than "C", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L Se você selecionou um idioma que não está disponível, você vai terá as mensagens em inglês (padrão). @@ -654,21 +673,21 @@ O valor retornado é sempre zero no modo quieto, exceto quando opções de linha =head1 PADRÕES -L +L -L +L -L +L -L +L =head1 AUTORES Benjamin Lin - Bernd Johannes Wuebben (modo mac2unix) - , Christian Wurll (adiciona nova linha extra) - , Erwin Waterlander - (mantenedor) -Página do projeto: L +Project page: L -Página do SourceForge: L +SourceForge page: L =head1 VEJA TAMBÉM diff --git a/dos2unix/man/pt_BR/man1/dos2unix.txt b/dos2unix/man/pt_BR/man1/dos2unix.txt index 520199a..64e1ec5 100644 --- a/dos2unix/man/pt_BR/man1/dos2unix.txt +++ b/dos2unix/man/pt_BR/man1/dos2unix.txt @@ -68,8 +68,7 @@ OPÇÕES preservação da propriedade do usuário e do grupo de arquivos. -ascii - Converte apenas as quebras de linhas. Esse é o modo de conversão - padrão. + Default conversion mode. See also section CONVERSION MODES. -iso Conversão entre conjunto de caractere do DOS e ISO-8859-1. Veja @@ -226,6 +225,17 @@ OPÇÕES Note que em algumas vezes um arquivo binário pode ser confundido com um arquivo texto. Veja também a opção "-s". + If in addition option "-e" or "--add-eol" is used also the type of + the line break of the last line is printed, or "noeol" if there is + none. + + Exemplo de saída: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Opcionalmente, opções extra podem ser definidas para alterar a saída. Uma ou mais opções podem ser adicionadas. @@ -245,12 +255,18 @@ OPÇÕES t Exibe se arquivo é texto ou binário. + e Print the type of the line break of the last line, or "noeol" if + there is none. + c Exibe apenas os arquivos que seriam convertidos. Com a opção "c", dos2unix vai exibir apenas os arquivos que contêm quebras de linha do DOS, unix2dos vai exibir apenas os nomes de arquivos que contêm quebras de linha do Unix. + If in addition option "-e" or "--add-eol" is used also the files + that lack a line break on the last line will be printed. + h Exibe um cabeçalho. p Mostra nomes de arquivos sem caminho. @@ -277,6 +293,11 @@ OPÇÕES unix2dos -ic *.txt + List the files that have DOS line breaks or lack a line break on the + last line: + + dos2unix -e -ic *.txt + Converte apenas arquivos que possuem quebras de linha do DOS e não altera outros arquivos: @@ -454,8 +475,8 @@ OPÇÕES Exibe informação da versão e sai. MODO MAC - No modo normal, as quebras de linhas são convertidas de DOS para Unix e - vice-versa. Quebras de linha do Mac não são convertidas. + By default line breaks are converted from DOS to Unix and vice versa. + Mac line breaks are not converted. No modo Mac, quebras de linha são convertidas de Mac para Unix e vice-versa. Quebras de linha do DOS não são alteradas. @@ -465,12 +486,16 @@ MODO MAC MODOS DE CONVERSÃO ascii - No modo "ascii", apenas as quebras de linha são convertidas. Esse é - o modo de conversão padrão. + This is the default conversion mode. This mode is for converting + ASCII and ASCII-compatible encoded files, like UTF-8. Enabling ascii + mode disables 7bit and iso mode. - Apesar do nome deste modo ser ASCII, o qual é um padrão de 7 bits, o - modo é em verdade 8 bits. Sempre use este modo quando quiser - converter arquivos Unicode UTF-8. + If dos2unix has UTF-16 support, UTF-16 encoded files are converted + to the current locale character encoding on POSIX systems and to + UTF-8 on Windows. Enabling ascii mode disables the option to keep + UTF-16 encoding ("-u") and the options to assume UTF-16 input ("-ul" + and "-ub"). To see if dos2unix has UTF-16 support type "dos2unix + -V". See also section UNICODE. 7bit Neste modo todos os caracteres não-ASCII de 8 bits (com valores @@ -541,8 +566,8 @@ UNICODE na maioria das vezes são codificados no formato UTF-16. Conversão - Arquivos texto em Unicode pode ter quebras de linha DOS, Unix ou Mac, - como arquivos texto comuns. + Unicode text files can have DOS, Unix or Mac line breaks, like ASCII + text files. Todas as versões do dos2unix e unix2dos podem converter arquivos codificados em UTF-8 porque UTF-8 foi projetado para ter compatibilidade @@ -576,10 +601,9 @@ UNICODE Modo de conversão ISO e 7 bits não funcionam em arquivos UTF-16. Marca de ordem de byte - No Windows, arquivos Unicode normalmente têm uma Marca de Ordem de Byte - (BOM), porque muitos programas (incluindo o Bloco de Notas) adiciona - BOMs por padrão. Veja também - . + On Windows Unicode text files typically have a Byte Order Mark (BOM), + because many Windows programs (including Notepad) add BOMs by default. + See also . No Unix, arquivos Unicode normalmente não têm BOM. Presume-se que arquivos texto são codificados na codificação de caracteres da @@ -630,9 +654,9 @@ UNICODE unix2dos < entrada.txt | iconv -f UTF-8 -t UTF-16 > saída.txt GB18030 - GB18030 é um padrão governamental chinês. Um subconjunto obrigatório do - padrão GB18030 é exigido oficialmente para todos os produtos de software - vendidos na China. Veja também . + GB18030 is a Chinese government standard. A mandatory subset of the + GB18030 standard is officially required for all software products sold + in China. See also . GB18030 é completamente compatível com Unicode e pode ser considerado um formato de transformação de unicode. Assim como UTF-8, GB18030 é @@ -749,24 +773,24 @@ LOCALIZAÇÃO export LANG=en_US.iso88591 Inglês, EUA, codificação Latin-1 export LANG=en_GB.UTF-8 Inglês, Reino Unido, codificação UTF-8 - Para a lista completa de códigos de idioma e país, veja o manual do - gettext: - + For a complete list of language and country codes see the gettext + manual: + Nos sistemas Unix, você pode usar o comando locale(1) para obter informação específica da localização. LANGUAGE - Com a variável de ambiente LANGUAGE, você pode especificar uma lista - de prioridades de idiomas, separada por vírgulas. Dos2unix fornece - preferência à LANGUAGE sobre LANG. Por exemplo, primeiro holandês e, - então, alemão: "LANGUAGE=nl:de". Você primeiro tem que habilitar - localização, definindo LANG (ou LC_ALL) para um valor diferente de - "C", antes que você possa usar uma lista de prioridade de idioma por - meio da variável LANGUAGE. Veja também o manual do gettext: - + With the LANGUAGE environment variable you can specify a priority + list of languages, separated by colons. Dos2unix gives preference to + LANGUAGE over LANG. For instance, first Dutch and then German: + "LANGUAGE=nl:de". You have to first enable localization, by setting + LANG (or LC_ALL) to a value other than "C", before you can use a + language priority list through the LANGUAGE variable. See also the + gettext manual: + Se você selecionou um idioma que não está disponível, você vai terá as mensagens em inglês (padrão). @@ -790,13 +814,13 @@ VALOR RETORNADO linha de comando erradas são usadas. PADRÕES - + - + - + - + AUTORES Benjamin Lin - Bernd Johannes Wuebben (modo @@ -804,9 +828,9 @@ AUTORES extra) - , Erwin Waterlander - (mantenedor) - Página do projeto: + Project page: - Página do SourceForge: + SourceForge page: VEJA TAMBÉM file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/dos2unix/man/ro/man1/dos2unix.1 b/dos2unix/man/ro/man1/dos2unix.1 index 3fbd9a5..9d5c986 100644 --- a/dos2unix/man/ro/man1/dos2unix.1 +++ b/dos2unix/man/ro/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2023-08-29" "dos2unix" "2023-08-29" +.TH dos2unix 1 "2024-01-22" "dos2unix" "2024-01-22" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -122,7 +122,7 @@ Permite schimbarea proprietarului fișierului în modul\-fișier_vechi. Când este utilizată această opțiune, conversia nu va fi întreruptă atunci când utilizatorul și/sau grupul proprietar al fișierului original nu poate fi păstrat în modul\-fișier_vechi. Conversia va continua și fișierul convertit va primi același nou proprietar ca și cum ar fi fost convertit în modul\-fișier_nou. A se vedea, de asemenea, opțiunile \f(CW\*(C`\-o\*(C'\fR și \f(CW\*(C`\-n\*(C'\fR. Această opțiune este disponibilă numai dacă «dos2unix» are suport pentru păstrarea utilizatorului și grupului proprietar al fișierelor. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" -Convertește numai întreruperile de linie. Acesta este modul de conversie implicit. +Modul de conversie implicit (între setul de caractere \s-1DOS\s0 și \s-1ISO\-8859\-1\s0). Consultați, de asemenea, secțiunea \s-1MODURI DE CONVERSIE.\s0 .IP "\fB\-iso\fR" 4 .IX Item "-iso" Conversie între setul de caractere \s-1DOS\s0 și \s-1ISO\-8859\-1.\s0 Consultați, de asemenea, secțiunea \s-1MODURI DE CONVERSIE.\s0 @@ -224,6 +224,17 @@ Exemplu de ieșire: .Sp Rețineți că, uneori, un fișier binar poate fi confundat cu un fișier text. A se vedea, de asemenea, opțiunea \f(CW\*(C`\-s\*(C'\fR. .Sp +Dacă, în plus, se utilizează opțiunea \f(CW\*(C`\-e\*(C'\fR sau \f(CW\*(C`\-\-add\-eol\*(C'\fR, se imprimă, de asemenea, tipul întreruperii de linie de pe ultima linie sau \f(CW\*(C`noeol\*(C'\fR, dacă nu există. +.Sp +Exemplu de ieșire: +.Sp +.Vb 4 +\& 6 0 0 no_bom text dos dos.txt +\& 0 6 0 no_bom text unix unix.txt +\& 0 0 6 no_bom text mac mac.txt +\& 1 0 0 no_bom text noeol noeol_dos.txt +.Ve +.Sp Opțional, pot fi adăugate fanioane suplimentare pentru a modifica rezultatul. Se pot adăuga unul sau mai multe fanioane. .RS 4 .IP "\fB0\fR" 4 @@ -244,17 +255,22 @@ Afișează marcajul de ordine a octeților. .IP "\fBt\fR" 4 .IX Item "t" Indică dacă fișierul este text sau binar. +.IP "\fBe\fR" 4 +.IX Item "e" +Imprimă tipul întreruperii de linie de pe ultima linie sau \f(CW\*(C`noeol\*(C'\fR dacă nu există. .IP "\fBc\fR" 4 .IX Item "c" Afișează numai fișierele care vor fi convertite. .Sp Cu fanionul \f(CW\*(C`c\*(C'\fR, «dos2unix» va afișa numai fișierele care conțin întreruperi de linie \s-1DOS,\s0 «unix2dos» va afișa numai numele de fișiere care au întreruperi de linie Unix. +.Sp +Dacă, în plus, se utilizează opțiunea \f(CW\*(C`\-e\*(C'\fR sau \f(CW\*(C`\-\-add\-eol\*(C'\fR, vor fi afișate și fișierele cărora le lipsește o întrerupere de linie pe ultima linie. .IP "\fBh\fR" 4 .IX Item "h" Afișează titlul. .IP "\fBp\fR" 4 .IX Item "p" -Afișează numele fișierelor fără cale. +Afișează (doar) numele fișierelor, fără ruta către ele. .RE .RS 4 .Sp @@ -290,6 +306,12 @@ Listează fișierele care au întreruperi de linie Unix: \& unix2dos \-ic *.txt .Ve .Sp +Listează fișierele care au întreruperi de linie \s-1DOS\s0 sau care nu au întreruperi de linie pe ultima linie: +.Sp +.Vb 1 +\& dos2unix \-e \-ic *.txt +.Ve +.Sp Convertește numai fișierele care au întreruperi de linie \s-1DOS\s0 și lasă celelalte fișiere neatinse: .Sp .Vb 1 @@ -410,7 +432,7 @@ Păstrează legăturile simbolice și țintele neschimbate (implicit). Afișează informațiile despre versiune și iese. .SH "MODUL MAC" .IX Header "MODUL MAC" -În modul normal, întreruperile de linie sunt convertite din \s-1DOS\s0 în Unix și invers. Întreruperile de linie Mac nu sunt convertite. +În mod implicit, salturile (întreruperile) de linie sunt convertite din \s-1DOS\s0 în Unix și invers. Întreruperile de linie Mac nu sunt convertite. .PP În modul Mac, întreruperile de linie sunt convertite din Mac în Unix și invers. Întreruperile de linie \s-1DOS\s0 nu sunt modificate. .PP @@ -419,9 +441,9 @@ Pentru a rula în modul Mac, utilizați opțiunea din linie de comandă \f(CW\*( .IX Header "MODURI DE CONVERSIE" .IP "\fBascii\fR" 4 .IX Item "ascii" -În modul \f(CW\*(C`ascii\*(C'\fR sunt convertite doar întreruperile de linie. Acesta este modul de conversie implicit. +Acesta este modul de conversie implicit. Acest mod este destinat conversiei fișierelor codificate \s-1ASCII\s0 și compatibile cu \s-1ASCII,\s0 cum ar fi \s-1UTF\-8.\s0 Activarea modului \fBascii\fR dezactivează modurile \fB7bit\fR și \fBiso\fR. .Sp -Deși numele acestui mod este \s-1ASCII,\s0 care este un standard de 7 biți, modul actual este de 8 biți. Utilizați întotdeauna acest mod când convertiți fișiere Unicode \s-1UTF\-8.\s0 +Dacă «dos2unix» are suport \s-1UTF\-16,\s0 fișierele codificate \s-1UTF\-16\s0 sunt convertite la codificarea caracterelor locale curente pe sistemele \s-1POSIX\s0 și la \s-1UTF\-8\s0 pe Windows. Activarea modului \fBascii\fR dezactivează opțiunea de păstrare a codificării \s-1UTF\-16\s0 (\f(CW\*(C`\-u\*(C'\fR) și opțiunile de asumare a intrării \s-1UTF\-16\s0 (\f(CW\*(C`\-ul\*(C'\fR și \f(CW\*(C`\-ub\*(C'\fR). Pentru a vedea dacă «dos2unix» are suport \s-1UTF\-16,\s0 tastați \f(CW\*(C`dos2unix \-V\*(C'\fR. A se vedea și secțiunea \s-1UNICODE.\s0 .IP "\fB7bit\fR" 4 .IX Item "7bit" În acest mod, toate caracterele de 8 biți non-ASCII (cu valori de la 128 la 255) sunt convertite într\-un spațiu de 7 biți. @@ -491,7 +513,7 @@ Consultați de asemenea și . +În Windows, fișierele text Unicode au de obicei un marcaj de ordine a octeților (\s-1BOM\s0), deoarece multe programe Windows (inclusiv Notepad) adaugă marcajul de ordine a octeților în mod implicit. A se vedea, de asemenea, . .PP În Unix, fișierele Unicode nu au de obicei un marcaj de ordine a octeților (\s-1BOM\s0). Se presupune că fișierele text sunt codificate în codificarea caracterelor stabilită de localizare. .PP @@ -555,7 +577,7 @@ Convertește din \s-1UTF\-8\s0 Unix în \s-1UTF\-16\s0 Windows: .Ve .SH "GB18030" .IX Header "GB18030" -\&\s-1GB18030\s0 este un standard guvernamental chinez. Un subset obligatoriu al standardului \s-1GB18030\s0 este obligatoriu oficial pentru toate produsele software vândute în China. A se vedea, de asemenea, . +\&\s-1GB18030\s0 este un standard guvernamental chinez. Un subset obligatoriu al standardului \s-1GB18030\s0 este obligatoriu oficial pentru toate produsele software vândute în China. A se vedea, de asemenea, . .PP Standardul \s-1GB18030\s0 este pe deplin compatibil cu Unicode și poate fi considerat un format de transformare unicode. La fel ca \s-1UTF\-8, GB18030\s0 este compatibil cu \s-1ASCII. GB18030\s0 este, de asemenea, compatibil cu pagina de cod 936 Windows, cunoscută și sub numele de \s-1GBK.\s0 .PP @@ -680,12 +702,12 @@ Limba principală este selectată cu variabila de mediu \s-1LANG.\s0 Variabila \ \& export LANG=en_GB.UTF\-8 Engleză, UK, codificarea UTF\-8 .Ve .Sp -Pentru o listă completă a codurilor de limbă și de țară, consultați manualul «gettext»: +Pentru o listă completă a codurilor de limbă și de țară, consultați manualul «gettext»: .Sp În sistemele Unix, puteți utiliza comanda \fBlocale\fR\|(1) pentru a obține informații specifice despre localizare. .IP "\fB\s-1LANGUAGE\s0\fR" 4 .IX Item "LANGUAGE" -Cu variabila de mediu \s-1LANGUAGE\s0 puteți specifica o listă cu prioritate de limbi, separate prin două puncte. «dos2unix» dă preferință variabilei \s-1LANGUAGE\s0 în detrimentul variabilei \s-1LANG.\s0 De exemplu, mai întâi olandeză și apoi germană: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. Mai întâi trebuie să activați localizarea, definind \s-1LANG\s0 (sau \s-1LC_ALL\s0) la o altă valoare decât „C”, înainte de a putea utiliza o listă cu prioritate de limbă prin variabila \s-1LANGUAGE.\s0 Consultați și manualul «gettext»: +Cu variabila de mediu \s-1LANGUAGE\s0 puteți specifica o listă cu prioritate de limbi, separate prin două puncte. «dos2unix» dă preferință variabilei \s-1LANGUAGE\s0 în detrimentul variabilei \s-1LANG.\s0 De exemplu, mai întâi olandeză și apoi germană: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. Mai întâi trebuie să activați localizarea, definind \s-1LANG\s0 (sau \s-1LC_ALL\s0) la o altă valoare decât „C”, înainte de a putea utiliza o listă cu prioritate de limbă prin variabila \s-1LANGUAGE.\s0 Consultați și manualul «gettext»: .Sp Dacă selectați o limbă care nu este disponibilă, veți primi mesajele standard în limba engleză. .IP "\fB\s-1DOS2UNIX_LOCALEDIR\s0\fR" 4 @@ -706,18 +728,18 @@ Valoarea returnată este întotdeauna zero în modul silențios, cu excepția ca .IX Header "STANDARDE" .PP - + .PP - + .PP .SH "AUTORI" .IX Header "AUTORI" Benjamin Lin \- , Bernd Johannes Wuebben (modul mac2unix) \- , Christian Wurll (adăugarea unei linii noi suplimentare) \- , Erwin Waterlander \- (menținător) .PP -Pagina principală a proiectului: +Pagina principală a proiectului: .PP -Pagina SourceForge a proiectului: +Pagina din SourceForge a proiectului: .SH "CONSULTAȚI ȘI" .IX Header "CONSULTAȚI ȘI" \&\fBfile\fR\|(1) \fBfind\fR\|(1) \fBiconv\fR\|(1) \fBlocale\fR\|(1) \fBxargs\fR\|(1) diff --git a/dos2unix/man/ro/man1/dos2unix.htm b/dos2unix/man/ro/man1/dos2unix.htm index 8f27a9e..500b37f 100644 --- a/dos2unix/man/ro/man1/dos2unix.htm +++ b/dos2unix/man/ro/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.5.1 - Convertor de format de fișier text din DOS/Mac în Unix și viceversa +dos2unix 7.5.2 - Convertor de format de fișier text din DOS/Mac în Unix și viceversa @@ -89,7 +89,7 @@

OPȚIUNI

-ascii
-

Convertește numai întreruperile de linie. Acesta este modul de conversie implicit.

+

Modul de conversie implicit (între setul de caractere DOS și ISO-8859-1). Consultați, de asemenea, secțiunea MODURI DE CONVERSIE.

-iso
@@ -246,6 +246,15 @@

OPȚIUNI

Rețineți că, uneori, un fișier binar poate fi confundat cu un fișier text. A se vedea, de asemenea, opțiunea -s.

+

Dacă, în plus, se utilizează opțiunea -e sau --add-eol, se imprimă, de asemenea, tipul întreruperii de linie de pe ultima linie sau noeol, dacă nu există.

+ +

Exemplu de ieșire:

+ +
6       0       0  no_bom    text   dos     dos.txt
+0       6       0  no_bom    text   unix    unix.txt
+0       0       6  no_bom    text   mac     mac.txt
+1       0       0  no_bom    text   noeol   noeol_dos.txt
+

Opțional, pot fi adăugate fanioane suplimentare pentru a modifica rezultatul. Se pot adăuga unul sau mai multe fanioane.

@@ -285,6 +294,12 @@

OPȚIUNI

Indică dacă fișierul este text sau binar.

+ +
e
+
+ +

Imprimă tipul întreruperii de linie de pe ultima linie sau noeol dacă nu există.

+
c
@@ -293,6 +308,8 @@

OPȚIUNI

Cu fanionul c, «dos2unix» va afișa numai fișierele care conțin întreruperi de linie DOS, «unix2dos» va afișa numai numele de fișiere care au întreruperi de linie Unix.

+

Dacă, în plus, se utilizează opțiunea -e sau --add-eol, vor fi afișate și fișierele cărora le lipsește o întrerupere de linie pe ultima linie.

+
h
@@ -303,7 +320,7 @@

OPȚIUNI

p
-

Afișează numele fișierelor fără cale.

+

Afișează (doar) numele fișierelor, fără ruta către ele.

@@ -330,6 +347,10 @@

OPȚIUNI

unix2dos -ic *.txt
+

Listează fișierele care au întreruperi de linie DOS sau care nu au întreruperi de linie pe ultima linie:

+ +
dos2unix -e -ic *.txt
+

Convertește numai fișierele care au întreruperi de linie DOS și lasă celelalte fișiere neatinse:

dos2unix -ic0 *.txt | xargs -0 dos2unix
@@ -503,7 +524,7 @@

OPȚIUNI

MODUL MAC

-

În modul normal, întreruperile de linie sunt convertite din DOS în Unix și invers. Întreruperile de linie Mac nu sunt convertite.

+

În mod implicit, salturile (întreruperile) de linie sunt convertite din DOS în Unix și invers. Întreruperile de linie Mac nu sunt convertite.

În modul Mac, întreruperile de linie sunt convertite din Mac în Unix și invers. Întreruperile de linie DOS nu sunt modificate.

@@ -516,9 +537,9 @@

MODURI DE CONVERSIE

ascii
-

În modul ascii sunt convertite doar întreruperile de linie. Acesta este modul de conversie implicit.

+

Acesta este modul de conversie implicit. Acest mod este destinat conversiei fișierelor codificate ASCII și compatibile cu ASCII, cum ar fi UTF-8. Activarea modului ascii dezactivează modurile 7bit și iso.

-

Deși numele acestui mod este ASCII, care este un standard de 7 biți, modul actual este de 8 biți. Utilizați întotdeauna acest mod când convertiți fișiere Unicode UTF-8.

+

Dacă «dos2unix» are suport UTF-16, fișierele codificate UTF-16 sunt convertite la codificarea caracterelor locale curente pe sistemele POSIX și la UTF-8 pe Windows. Activarea modului ascii dezactivează opțiunea de păstrare a codificării UTF-16 (-u) și opțiunile de asumare a intrării UTF-16 (-ul și -ub). Pentru a vedea dacă «dos2unix» are suport UTF-16, tastați dos2unix -V. A se vedea și secțiunea UNICODE.

7bit
@@ -583,7 +604,7 @@

Codificări

Conversie

-

Fișierele text Unicode pot avea întreruperi de linie DOS, Unix sau Mac, ca și fișierele text obișnuite.

+

Fișierele text Unicode pot avea întreruperi de linie DOS, Unix sau Mac, ca și fișierele text ASCII.

Toate versiunile de «dos2unix» și «unix2dos» pot converti fișiere codificate în formatul UTF-8, deoarece UTF-8 a fost conceput pentru compatibilitate cu ASCII.

@@ -603,7 +624,7 @@

Conversie

Marcajul de ordine a octeților

-

În Windows, fișierele text Unicode au de obicei un marcaj de ordine a octeților (BOM), deoarece multe programe Windows (inclusiv Notepad) adaugă marcajul de ordine a octeților în mod implicit. A se vedea, de asemenea, http://en.wikipedia.org/wiki/Byte_order_mark.

+

În Windows, fișierele text Unicode au de obicei un marcaj de ordine a octeților (BOM), deoarece multe programe Windows (inclusiv Notepad) adaugă marcajul de ordine a octeților în mod implicit. A se vedea, de asemenea, https://en.wikipedia.org/wiki/Byte_order_mark.

În Unix, fișierele Unicode nu au de obicei un marcaj de ordine a octeților (BOM). Se presupune că fișierele text sunt codificate în codificarea caracterelor stabilită de localizare.

@@ -643,7 +664,7 @@

Exemple Unicode

GB18030

-

GB18030 este un standard guvernamental chinez. Un subset obligatoriu al standardului GB18030 este obligatoriu oficial pentru toate produsele software vândute în China. A se vedea, de asemenea, http://en.wikipedia.org/wiki/GB_18030.

+

GB18030 este un standard guvernamental chinez. Un subset obligatoriu al standardului GB18030 este obligatoriu oficial pentru toate produsele software vândute în China. A se vedea, de asemenea, https://en.wikipedia.org/wiki/GB_18030.

Standardul GB18030 este pe deplin compatibil cu Unicode și poate fi considerat un format de transformare unicode. La fel ca UTF-8, GB18030 este compatibil cu ASCII. GB18030 este, de asemenea, compatibil cu pagina de cod 936 Windows, cunoscută și sub numele de GBK.

@@ -742,7 +763,7 @@

LOCALIZAREA

export LANG=en_US.iso88591 Engleză, SUA, codificarea Latin-1 export LANG=en_GB.UTF-8 Engleză, UK, codificarea UTF-8 -

Pentru o listă completă a codurilor de limbă și de țară, consultați manualul «gettext»: http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

+

Pentru o listă completă a codurilor de limbă și de țară, consultați manualul «gettext»: https://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

În sistemele Unix, puteți utiliza comanda locale(1) pentru a obține informații specifice despre localizare.

@@ -750,7 +771,7 @@

LOCALIZAREA

LANGUAGE
-

Cu variabila de mediu LANGUAGE puteți specifica o listă cu prioritate de limbi, separate prin două puncte. «dos2unix» dă preferință variabilei LANGUAGE în detrimentul variabilei LANG. De exemplu, mai întâi olandeză și apoi germană: LANGUAGE=nl:de. Mai întâi trebuie să activați localizarea, definind LANG (sau LC_ALL) la o altă valoare decât „C”, înainte de a putea utiliza o listă cu prioritate de limbă prin variabila LANGUAGE. Consultați și manualul «gettext»: http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

+

Cu variabila de mediu LANGUAGE puteți specifica o listă cu prioritate de limbi, separate prin două puncte. «dos2unix» dă preferință variabilei LANGUAGE în detrimentul variabilei LANG. De exemplu, mai întâi olandeză și apoi germană: LANGUAGE=nl:de. Mai întâi trebuie să activați localizarea, definind LANG (sau LC_ALL) la o altă valoare decât „C”, înainte de a putea utiliza o listă cu prioritate de limbă prin variabila LANGUAGE. Consultați și manualul «gettext»: https://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

Dacă selectați o limbă care nu este disponibilă, veți primi mesajele standard în limba engleză.

@@ -777,9 +798,9 @@

STANDARDE

https://ro.wikipedia.org/wiki/Fi%C8%99ier_text

-

http://en.wikipedia.org/wiki/Carriage_return

+

https://en.wikipedia.org/wiki/Carriage_return

-

http://en.wikipedia.org/wiki/Newline

+

https://en.wikipedia.org/wiki/Newline

https://ro.wikipedia.org/wiki/Unicode

@@ -787,9 +808,9 @@

AUTORI

Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (modul mac2unix) - <wuebben@kde.org>, Christian Wurll (adăugarea unei linii noi suplimentare) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (menținător)

-

Pagina principală a proiectului: http://waterlan.home.xs4all.nl/dos2unix.html

+

Pagina principală a proiectului: https://waterlan.home.xs4all.nl/dos2unix.html

-

Pagina SourceForge a proiectului: http://sourceforge.net/projects/dos2unix/

+

Pagina din SourceForge a proiectului: https://sourceforge.net/projects/dos2unix/

CONSULTAȚI ȘI

diff --git a/dos2unix/man/ro/man1/dos2unix.pod b/dos2unix/man/ro/man1/dos2unix.pod index 5bd59d3..898950b 100644 --- a/dos2unix/man/ro/man1/dos2unix.pod +++ b/dos2unix/man/ro/man1/dos2unix.pod @@ -63,7 +63,7 @@ Când este utilizată această opțiune, conversia nu va fi întreruptă atunci =item B<-ascii> -Convertește numai întreruperile de linie. Acesta este modul de conversie implicit. +Modul de conversie implicit (între setul de caractere DOS și ISO-8859-1). Consultați, de asemenea, secțiunea MODURI DE CONVERSIE. =item B<-iso> @@ -188,6 +188,15 @@ Exemplu de ieșire: Rețineți că, uneori, un fișier binar poate fi confundat cu un fișier text. A se vedea, de asemenea, opțiunea C<-s>. +Dacă, în plus, se utilizează opțiunea C<-e> sau C<--add-eol>, se imprimă, de asemenea, tipul întreruperii de linie de pe ultima linie sau C, dacă nu există. + +Exemplu de ieșire: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Opțional, pot fi adăugate fanioane suplimentare pentru a modifica rezultatul. Se pot adăuga unul sau mai multe fanioane. =over 4 @@ -216,19 +225,25 @@ Afișează marcajul de ordine a octeților. Indică dacă fișierul este text sau binar. +=item B + +Imprimă tipul întreruperii de linie de pe ultima linie sau C dacă nu există. + =item B Afișează numai fișierele care vor fi convertite. Cu fanionul C, «dos2unix» va afișa numai fișierele care conțin întreruperi de linie DOS, «unix2dos» va afișa numai numele de fișiere care au întreruperi de linie Unix. +Dacă, în plus, se utilizează opțiunea C<-e> sau C<--add-eol>, vor fi afișate și fișierele cărora le lipsește o întrerupere de linie pe ultima linie. + =item B Afișează titlul. =item B

-Afișează numele fișierelor fără cale. +Afișează (doar) numele fișierelor, fără ruta către ele. =back @@ -254,6 +269,10 @@ Listează fișierele care au întreruperi de linie Unix: unix2dos -ic *.txt +Listează fișierele care au întreruperi de linie DOS sau care nu au întreruperi de linie pe ultima linie: + + dos2unix -e -ic *.txt + Convertește numai fișierele care au întreruperi de linie DOS și lasă celelalte fișiere neatinse: dos2unix -ic0 *.txt | xargs -0 dos2unix @@ -388,7 +407,7 @@ Afișează informațiile despre versiune și iese. =head1 MODUL MAC -În modul normal, întreruperile de linie sunt convertite din DOS în Unix și invers. Întreruperile de linie Mac nu sunt convertite. +În mod implicit, salturile (întreruperile) de linie sunt convertite din DOS în Unix și invers. Întreruperile de linie Mac nu sunt convertite. În modul Mac, întreruperile de linie sunt convertite din Mac în Unix și invers. Întreruperile de linie DOS nu sunt modificate. @@ -400,9 +419,9 @@ Pentru a rula în modul Mac, utilizați opțiunea din linie de comandă C<-c mac =item B -În modul C sunt convertite doar întreruperile de linie. Acesta este modul de conversie implicit. +Acesta este modul de conversie implicit. Acest mod este destinat conversiei fișierelor codificate ASCII și compatibile cu ASCII, cum ar fi UTF-8. Activarea modului B dezactivează modurile B<7bit> și B. -Deși numele acestui mod este ASCII, care este un standard de 7 biți, modul actual este de 8 biți. Utilizați întotdeauna acest mod când convertiți fișiere Unicode UTF-8. +Dacă «dos2unix» are suport UTF-16, fișierele codificate UTF-16 sunt convertite la codificarea caracterelor locale curente pe sistemele POSIX și la UTF-8 pe Windows. Activarea modului B dezactivează opțiunea de păstrare a codificării UTF-16 (C<-u>) și opțiunile de asumare a intrării UTF-16 (C<-ul> și C<-ub>). Pentru a vedea dacă «dos2unix» are suport UTF-16, tastați C. A se vedea și secțiunea UNICODE. =item B<7bit> @@ -462,7 +481,7 @@ Există diferite codificări Unicode. În Unix și Linux fișierele Unicode sunt =head2 Conversie -Fișierele text Unicode pot avea întreruperi de linie DOS, Unix sau Mac, ca și fișierele text obișnuite. +Fișierele text Unicode pot avea întreruperi de linie DOS, Unix sau Mac, ca și fișierele text ASCII. Toate versiunile de «dos2unix» și «unix2dos» pot converti fișiere codificate în formatul UTF-8, deoarece UTF-8 a fost conceput pentru compatibilitate cu ASCII. @@ -482,7 +501,7 @@ Modurile de conversie ISO și 7 biți nu funcționează pe fișierele UTF-16. =head2 Marcajul de ordine a octeților -În Windows, fișierele text Unicode au de obicei un marcaj de ordine a octeților (BOM), deoarece multe programe Windows (inclusiv Notepad) adaugă marcajul de ordine a octeților în mod implicit. A se vedea, de asemenea, L. +În Windows, fișierele text Unicode au de obicei un marcaj de ordine a octeților (BOM), deoarece multe programe Windows (inclusiv Notepad) adaugă marcajul de ordine a octeților în mod implicit. A se vedea, de asemenea, L. În Unix, fișierele Unicode nu au de obicei un marcaj de ordine a octeților (BOM). Se presupune că fișierele text sunt codificate în codificarea caracterelor stabilită de localizare. @@ -522,7 +541,7 @@ Convertește din UTF-8 Unix în UTF-16 Windows: =head1 GB18030 -GB18030 este un standard guvernamental chinez. Un subset obligatoriu al standardului GB18030 este obligatoriu oficial pentru toate produsele software vândute în China. A se vedea, de asemenea, L. +GB18030 este un standard guvernamental chinez. Un subset obligatoriu al standardului GB18030 este obligatoriu oficial pentru toate produsele software vândute în China. A se vedea, de asemenea, L. Standardul GB18030 este pe deplin compatibil cu Unicode și poate fi considerat un format de transformare unicode. La fel ca UTF-8, GB18030 este compatibil cu ASCII. GB18030 este, de asemenea, compatibil cu pagina de cod 936 Windows, cunoscută și sub numele de GBK. @@ -622,13 +641,13 @@ Limba principală este selectată cu variabila de mediu LANG. Variabila LANG con export LANG=en_US.iso88591 Engleză, SUA, codificarea Latin-1 export LANG=en_GB.UTF-8 Engleză, UK, codificarea UTF-8 -Pentru o listă completă a codurilor de limbă și de țară, consultați manualul «gettext»: L +Pentru o listă completă a codurilor de limbă și de țară, consultați manualul «gettext»: L În sistemele Unix, puteți utiliza comanda locale(1) pentru a obține informații specifice despre localizare. =item B -Cu variabila de mediu LANGUAGE puteți specifica o listă cu prioritate de limbi, separate prin două puncte. «dos2unix» dă preferință variabilei LANGUAGE în detrimentul variabilei LANG. De exemplu, mai întâi olandeză și apoi germană: C. Mai întâi trebuie să activați localizarea, definind LANG (sau LC_ALL) la o altă valoare decât „C”, înainte de a putea utiliza o listă cu prioritate de limbă prin variabila LANGUAGE. Consultați și manualul «gettext»: L +Cu variabila de mediu LANGUAGE puteți specifica o listă cu prioritate de limbi, separate prin două puncte. «dos2unix» dă preferință variabilei LANGUAGE în detrimentul variabilei LANG. De exemplu, mai întâi olandeză și apoi germană: C. Mai întâi trebuie să activați localizarea, definind LANG (sau LC_ALL) la o altă valoare decât „C”, înainte de a putea utiliza o listă cu prioritate de limbă prin variabila LANGUAGE. Consultați și manualul «gettext»: L Dacă selectați o limbă care nu este disponibilă, veți primi mesajele standard în limba engleză. @@ -656,9 +675,9 @@ Valoarea returnată este întotdeauna zero în modul silențios, cu excepția ca L -L +L -L +L L @@ -666,9 +685,9 @@ L Benjamin Lin - , Bernd Johannes Wuebben (modul mac2unix) - , Christian Wurll (adăugarea unei linii noi suplimentare) - , Erwin Waterlander - (menținător) -Pagina principală a proiectului: L +Pagina principală a proiectului: L -Pagina SourceForge a proiectului: L +Pagina din SourceForge a proiectului: L =head1 CONSULTAȚI ȘI diff --git a/dos2unix/man/ro/man1/dos2unix.txt b/dos2unix/man/ro/man1/dos2unix.txt index 050f2fd..e2346cd 100644 --- a/dos2unix/man/ro/man1/dos2unix.txt +++ b/dos2unix/man/ro/man1/dos2unix.txt @@ -70,8 +70,8 @@ OPȚIUNI grupului proprietar al fișierelor. -ascii - Convertește numai întreruperile de linie. Acesta este modul de - conversie implicit. + Modul de conversie implicit (între setul de caractere DOS și + ISO-8859-1). Consultați, de asemenea, secțiunea MODURI DE CONVERSIE. -iso Conversie între setul de caractere DOS și ISO-8859-1. Consultați, de @@ -232,6 +232,17 @@ OPȚIUNI Rețineți că, uneori, un fișier binar poate fi confundat cu un fișier text. A se vedea, de asemenea, opțiunea "-s". + Dacă, în plus, se utilizează opțiunea "-e" sau "--add-eol", se + imprimă, de asemenea, tipul întreruperii de linie de pe ultima linie + sau "noeol", dacă nu există. + + Exemplu de ieșire: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Opțional, pot fi adăugate fanioane suplimentare pentru a modifica rezultatul. Se pot adăuga unul sau mai multe fanioane. @@ -251,15 +262,22 @@ OPȚIUNI t Indică dacă fișierul este text sau binar. + e Imprimă tipul întreruperii de linie de pe ultima linie sau + "noeol" dacă nu există. + c Afișează numai fișierele care vor fi convertite. Cu fanionul "c", «dos2unix» va afișa numai fișierele care conțin întreruperi de linie DOS, «unix2dos» va afișa numai numele de fișiere care au întreruperi de linie Unix. + Dacă, în plus, se utilizează opțiunea "-e" sau "--add-eol", vor + fi afișate și fișierele cărora le lipsește o întrerupere de + linie pe ultima linie. + h Afișează titlul. - p Afișează numele fișierelor fără cale. + p Afișează (doar) numele fișierelor, fără ruta către ele. Exemple: @@ -284,6 +302,11 @@ OPȚIUNI unix2dos -ic *.txt + Listează fișierele care au întreruperi de linie DOS sau care nu au + întreruperi de linie pe ultima linie: + + dos2unix -e -ic *.txt + Convertește numai fișierele care au întreruperi de linie DOS și lasă celelalte fișiere neatinse: @@ -474,8 +497,8 @@ OPȚIUNI Afișează informațiile despre versiune și iese. MODUL MAC - În modul normal, întreruperile de linie sunt convertite din DOS în Unix - și invers. Întreruperile de linie Mac nu sunt convertite. + În mod implicit, salturile (întreruperile) de linie sunt convertite din + DOS în Unix și invers. Întreruperile de linie Mac nu sunt convertite. În modul Mac, întreruperile de linie sunt convertite din Mac în Unix și invers. Întreruperile de linie DOS nu sunt modificate. @@ -485,12 +508,18 @@ MODUL MAC MODURI DE CONVERSIE ascii - În modul "ascii" sunt convertite doar întreruperile de linie. Acesta - este modul de conversie implicit. - - Deși numele acestui mod este ASCII, care este un standard de 7 biți, - modul actual este de 8 biți. Utilizați întotdeauna acest mod când - convertiți fișiere Unicode UTF-8. + Acesta este modul de conversie implicit. Acest mod este destinat + conversiei fișierelor codificate ASCII și compatibile cu ASCII, cum + ar fi UTF-8. Activarea modului ascii dezactivează modurile 7bit și + iso. + + Dacă «dos2unix» are suport UTF-16, fișierele codificate UTF-16 sunt + convertite la codificarea caracterelor locale curente pe sistemele + POSIX și la UTF-8 pe Windows. Activarea modului ascii dezactivează + opțiunea de păstrare a codificării UTF-16 ("-u") și opțiunile de + asumare a intrării UTF-16 ("-ul" și "-ub"). Pentru a vedea dacă + «dos2unix» are suport UTF-16, tastați "dos2unix -V". A se vedea și + secțiunea UNICODE. 7bit În acest mod, toate caracterele de 8 biți non-ASCII (cu valori de la @@ -563,7 +592,7 @@ UNICODE Conversie Fișierele text Unicode pot avea întreruperi de linie DOS, Unix sau Mac, - ca și fișierele text obișnuite. + ca și fișierele text ASCII. Toate versiunile de «dos2unix» și «unix2dos» pot converti fișiere codificate în formatul UTF-8, deoarece UTF-8 a fost conceput pentru @@ -601,7 +630,7 @@ UNICODE În Windows, fișierele text Unicode au de obicei un marcaj de ordine a octeților (BOM), deoarece multe programe Windows (inclusiv Notepad) adaugă marcajul de ordine a octeților în mod implicit. A se vedea, de - asemenea, . + asemenea, . În Unix, fișierele Unicode nu au de obicei un marcaj de ordine a octeților (BOM). Se presupune că fișierele text sunt codificate în @@ -662,7 +691,7 @@ GB18030 GB18030 este un standard guvernamental chinez. Un subset obligatoriu al standardului GB18030 este obligatoriu oficial pentru toate produsele software vândute în China. A se vedea, de asemenea, - . + . Standardul GB18030 este pe deplin compatibil cu Unicode și poate fi considerat un format de transformare unicode. La fel ca UTF-8, GB18030 @@ -782,8 +811,8 @@ LOCALIZAREA Pentru o listă completă a codurilor de limbă și de țară, consultați manualul «gettext»: - + În sistemele Unix, puteți utiliza comanda locale(1) pentru a obține informații specifice despre localizare. @@ -797,8 +826,8 @@ LOCALIZAREA o altă valoare decât „C”, înainte de a putea utiliza o listă cu prioritate de limbă prin variabila LANGUAGE. Consultați și manualul «gettext»: - + Dacă selectați o limbă care nu este disponibilă, veți primi mesajele standard în limba engleză. @@ -824,9 +853,9 @@ VALOAREA RETURNATĂ STANDARDE - + - + @@ -837,10 +866,10 @@ AUTORI (menținător) Pagina principală a proiectului: - + - Pagina SourceForge a proiectului: - + Pagina din SourceForge a proiectului: + CONSULTAȚI ȘI file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/dos2unix/man/sr/man1/dos2unix.1 b/dos2unix/man/sr/man1/dos2unix.1 index 722ee5e..b5556ee 100644 --- a/dos2unix/man/sr/man1/dos2unix.1 +++ b/dos2unix/man/sr/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2023-08-29" "dos2unix" "2023-08-29" +.TH dos2unix 1 "2024-01-22" "dos2unix" "2024-01-22" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -122,7 +122,7 @@ dos2unix – претварач формата текстуалних датот Када се користи ова опција, претварање се неће прекинути када се власништво корисника и/или групе изворне датотеке не може сачувати у старом режиму датотеке. Претварање ће се наставити и претворена датотека ће добити исто ново власништво као да је претворена у режиму нове датотеке. Такође погледајте опције „\f(CW\*(C`\-o\*(C'\fR“ и „\f(CW\*(C`\-n\*(C'\fR“. Ова опција је доступна само ако „dos2unix“ има подршку за очување власништва корисника и групе над датотекама. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" -Претвара само преламање реда. Ово је основни режим претварања. +Default conversion mode. See also section \s-1CONVERSION MODES.\s0 .IP "\fB\-iso\fR" 4 .IX Item "-iso" Претварање између ДОС и ИСО\-8859\-1 скупа знакова. Видите такође одељак РЕЖИМИ ПРЕТВАРАЊА. @@ -224,6 +224,17 @@ dos2unix – претварач формата текстуалних датот .Sp Знајте да понекад бинарна датотека може грешком бити узета за текстуалну датотеку. Видите такође опцију „\f(CW\*(C`\-s\*(C'\fR“. .Sp +If in addition option \f(CW\*(C`\-e\*(C'\fR or \f(CW\*(C`\-\-add\-eol\*(C'\fR is used also the type of the line break of the last line is printed, or \f(CW\*(C`noeol\*(C'\fR if there is none. +.Sp +Пример излаза: +.Sp +.Vb 4 +\& 6 0 0 no_bom text dos dos.txt +\& 0 6 0 no_bom text unix unix.txt +\& 0 0 6 no_bom text mac mac.txt +\& 1 0 0 no_bom text noeol noeol_dos.txt +.Ve +.Sp Изборне додатне заставице се могу поставити да измене излаз. Могу се додати једна или више заставица. .RS 4 .IP "\fB0\fR" 4 @@ -244,11 +255,16 @@ dos2unix – претварач формата текстуалних датот .IP "\fBt\fR" 4 .IX Item "t" Исписује да ли је датотека текстуална или бинарна. +.IP "\fBe\fR" 4 +.IX Item "e" +Print the type of the line break of the last line, or \f(CW\*(C`noeol\*(C'\fR if there is none. .IP "\fBc\fR" 4 .IX Item "c" Исписује само датотеке које ће бити претворене. .Sp Са заставицом „\f(CW\*(C`c\*(C'\fR“ „dos2unix“ ће исписати само датотеке које садрже ДОС преламања реда, „unix2dos“ ће исписат само називе датотека које имају Јуникс преламања реда. +.Sp +If in addition option \f(CW\*(C`\-e\*(C'\fR or \f(CW\*(C`\-\-add\-eol\*(C'\fR is used also the files that lack a line break on the last line will be printed. .IP "\fBh\fR" 4 .IX Item "h" Исписује заглавље. @@ -290,6 +306,12 @@ dos2unix – претварач формата текстуалних датот \& unix2dos \-ic *.txt .Ve .Sp +List the files that have \s-1DOS\s0 line breaks or lack a line break on the last line: +.Sp +.Vb 1 +\& dos2unix \-e \-ic *.txt +.Ve +.Sp Претвара само датотеке које имају ДОС преламање реда и оставља друге датотеке нетакнутим: .Sp .Vb 1 @@ -410,7 +432,7 @@ dos2unix – претварач формата текстуалних датот Приказује податке о издању и излази. .SH "МЕК РЕЖИМ" .IX Header "МЕК РЕЖИМ" -У нормалном режиму преламања реда се претварју из ДОС\-а у Јуникс и обратно. Мек преламања реда се не претварају. +By default line breaks are converted from \s-1DOS\s0 to Unix and vice versa. Mac line breaks are not converted. .PP У Мек режиму преламања реда се претварју из Мек\-а у Јуникс и обратно. ДОС преламања реда се не мењају. .PP @@ -419,9 +441,9 @@ dos2unix – претварач формата текстуалних датот .IX Header "РЕЖИМИ ПРЕТВАРАЊА" .IP "\fBascii\fR" 4 .IX Item "ascii" -У „\f(CW\*(C`ascii\*(C'\fR“ режиму само преламања реда се претварају. Ово је основни режим претварања. +This is the default conversion mode. This mode is for converting \s-1ASCII\s0 and ASCII-compatible encoded files, like \s-1UTF\-8.\s0 Enabling \fBascii\fR mode disables \fB7bit\fR and \fBiso\fR mode. .Sp -Иако је назив овог режима АСКРИ, што је 7\-битни стандард, стварни режим је 8\-битни. Увек користите овај режим приликом претварања Јуникод УТФ\-8 датотека. +If dos2unix has \s-1UTF\-16\s0 support, \s-1UTF\-16\s0 encoded files are converted to the current locale character encoding on \s-1POSIX\s0 systems and to \s-1UTF\-8\s0 on Windows. Enabling \fBascii\fR mode disables the option to keep \s-1UTF\-16\s0 encoding (\f(CW\*(C`\-u\*(C'\fR) and the options to assume \s-1UTF\-16\s0 input (\f(CW\*(C`\-ul\*(C'\fR and \f(CW\*(C`\-ub\*(C'\fR). To see if dos2unix has \s-1UTF\-16\s0 support type \f(CW\*(C`dos2unix \-V\*(C'\fR. See also section \s-1UNICODE.\s0 .IP "\fB7bit\fR" 4 .IX Item "7bit" У овом режиму сви 8 битни не\-АСКРИ знаци (са вредностима од 128 до 255) се претварају у 7 битне размаке. @@ -491,7 +513,7 @@ dos2unix – претварач формата текстуалних датот Постоје различита Јуникод кодирања. На Јуниксу и Линуксу Јуникод датотеке су обично кодиране у УТФ\-8 кодирању. На Виндоузу Јуникод текстуалне датотеке могу бити кодиране у УТФ\-8, УТФ\-16 или УТФ\-16 великој крајности, али су углавном кодиране у УТФ\-16 формату. .SS "Претварање" .IX Subsection "Претварање" -Јуникод текстуалне датотеке могу имати ДОС, Јуникс или мек преломе реда, као обичне текстуалне датотеке. +Unicode text files can have \s-1DOS,\s0 Unix or Mac line breaks, like \s-1ASCII\s0 text files. .PP Сва издања „dos2unix“\-а и „unix2do“\-а могу претворити УТФ\-8 кодиране датотеке, јер је УТФ\-8 дизајниран за повратну сагласност са АСКРИ\-ијем. .PP @@ -510,7 +532,7 @@ dos2unix – претварач формата текстуалних датот ИСО и 7\-битни режим претварања не ради на УТФ\-16 датотекама. .SS "Ознака редоследа бајтова" .IX Subsection "Ознака редоследа бајтова" -На Виндоузу Јуникод текстуалне датотеке обично имају Ознаку редоследа бајтова (\s-1BOM\s0), јер многи Виндоуз програми (укључујући Бележницу) подразумевано додају ОРБ. Видите такође . +On Windows Unicode text files typically have a Byte Order Mark (\s-1BOM\s0), because many Windows programs (including Notepad) add BOMs by default. See also . .PP На Јуниксу Јуникод датотеке обично немају ОРБ. Претпоставља се да су текстуалне датотеке кодиране у језичком кодирању знака. .PP @@ -555,7 +577,7 @@ dos2unix – претварач формата текстуалних датот .Ve .SH "GB18030" .IX Header "GB18030" -„GB18030“ је стандард кинеске владе. Обавезни подскуп „GB18030“ стандард се званично захтева за све софтверске производе продате у Кини. Видите такође . +\&\s-1GB18030\s0 is a Chinese government standard. A mandatory subset of the \s-1GB18030\s0 standard is officially required for all software products sold in China. See also . .PP „GB18030“ је у потпуности сагласан са Јуникод\-ом, и може се сматрати Јуникод форматом преображаја. Као УТФ\-8, „GB18030“ је сагласан са АСКРИ. „GB18030“ је такође сагласан са Виндоуз кодном страницом 936, познатом и као ГБК. .PP @@ -680,12 +702,12 @@ dos2unix – претварач формата текстуалних датот \& export LANG=en_GB.UTF\-8 Енглески, УК, УТФ\-8 кодирање .Ve .Sp -За потпун списак језика и шифара држава видите приручник геттекста: +For a complete list of language and country codes see the gettext manual: .Sp На Јуникс системима можете користити наредбу „\fBlocale\fR\|(1)“ да видите особене податке језика. .IP "\fBЈЕЗИК\fR" 4 .IX Item "ЈЕЗИК" -Са променљивом окружења ЈЕЗИК можете навести списак хитности језика. „dos2unix“ даје предност за ЈЕЗИК над ЈЕЗ. На пример, прво холандски а затим немачки: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. Прво треба да омогућите преводе, постављајући „LANG“ (или \s-1LC_ALL\s0) на вредност другаачију од „C“, пре него ли будете могли да користите списак хитности језика променљивом „LANGUAGE“. Видите такође приручник геттекста: +With the \s-1LANGUAGE\s0 environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to \s-1LANGUAGE\s0 over \s-1LANG.\s0 For instance, first Dutch and then German: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. You have to first enable localization, by setting \s-1LANG\s0 (or \s-1LC_ALL\s0) to a value other than \*(L"C\*(R", before you can use a language priority list through the \s-1LANGUAGE\s0 variable. See also the gettext manual: .Sp Ако изаберете језик који није доступан добићете стандардне поруке на енглеском. .IP "\fB\s-1DOS2UNIX_LOCALEDIR\s0\fR" 4 @@ -704,20 +726,20 @@ dos2unix – претварач формата текстуалних датот Вредност резултата је увек нула у тихом режиму, изузев када се користе погрешне опције линије наредби. .SH "СТАНДАРДИ" .IX Header "СТАНДАРДИ" - + .PP - + .PP - + .PP - + .SH "АУТОРИ" .IX Header "АУТОРИ" Бенџамин Лин – , Бернд Јоханес Вебен (mac2unix) – , Кристијан Вирл (додаје додатни нови ред) – , Ервин Вотерландер – (одржавалац) .PP -Страница пројекта: +Project page: .PP -Страница Ковнице извора: +SourceForge page: .SH "ВИДИТЕ ТАКОЂЕ" .IX Header "ВИДИТЕ ТАКОЂЕ" \&\fBfile\fR\|(1) \fBfind\fR\|(1) \fBiconv\fR\|(1) \fBlocale\fR\|(1) \fBxargs\fR\|(1) diff --git a/dos2unix/man/sr/man1/dos2unix.htm b/dos2unix/man/sr/man1/dos2unix.htm index 5ad054f..9ff3321 100644 --- a/dos2unix/man/sr/man1/dos2unix.htm +++ b/dos2unix/man/sr/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.5.1 - претварач формата текстуалних датотека из ДОС/Мек-а у Јуникс и обратно +dos2unix 7.5.2 - претварач формата текстуалних датотека из ДОС/Мек-а у Јуникс и обратно @@ -89,7 +89,7 @@

ОПЦИЈЕ

-ascii
-

Претвара само преламање реда. Ово је основни режим претварања.

+

Default conversion mode. See also section CONVERSION MODES.

-iso
@@ -246,6 +246,15 @@

ОПЦИЈЕ

Знајте да понекад бинарна датотека може грешком бити узета за текстуалну датотеку. Видите такође опцију „-s“.

+

If in addition option -e or --add-eol is used also the type of the line break of the last line is printed, or noeol if there is none.

+ +

Пример излаза:

+ +
6       0       0  no_bom    text   dos     dos.txt
+0       6       0  no_bom    text   unix    unix.txt
+0       0       6  no_bom    text   mac     mac.txt
+1       0       0  no_bom    text   noeol   noeol_dos.txt
+

Изборне додатне заставице се могу поставити да измене излаз. Могу се додати једна или више заставица.

@@ -285,6 +294,12 @@

ОПЦИЈЕ

Исписује да ли је датотека текстуална или бинарна.

+ +
e
+
+ +

Print the type of the line break of the last line, or noeol if there is none.

+
c
@@ -293,6 +308,8 @@

ОПЦИЈЕ

Са заставицом „c“ „dos2unix“ ће исписати само датотеке које садрже ДОС преламања реда, „unix2dos“ ће исписат само називе датотека које имају Јуникс преламања реда.

+

If in addition option -e or --add-eol is used also the files that lack a line break on the last line will be printed.

+
h
@@ -330,6 +347,10 @@

ОПЦИЈЕ

unix2dos -ic *.txt
+

List the files that have DOS line breaks or lack a line break on the last line:

+ +
dos2unix -e -ic *.txt
+

Претвара само датотеке које имају ДОС преламање реда и оставља друге датотеке нетакнутим:

dos2unix -ic0 *.txt | xargs -0 dos2unix
@@ -503,7 +524,7 @@

ОПЦИЈЕ

МЕК РЕЖИМ

-

У нормалном режиму преламања реда се претварју из ДОС-а у Јуникс и обратно. Мек преламања реда се не претварају.

+

By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted.

У Мек режиму преламања реда се претварју из Мек-а у Јуникс и обратно. ДОС преламања реда се не мењају.

@@ -516,9 +537,9 @@

РЕЖИМИ ПРЕB
ascii
-

У „ascii“ режиму само преламања реда се претварају. Ово је основни режим претварања.

+

This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling ascii mode disables 7bit and iso mode.

-

Иако је назив овог режима АСКРИ, што је 7-битни стандард, стварни режим је 8-битни. Увек користите овај режим приликом претварања Јуникод УТФ-8 датотека.

+

If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling ascii mode disables the option to keep UTF-16 encoding (-u) and the options to assume UTF-16 input (-ul and -ub). To see if dos2unix has UTF-16 support type dos2unix -V. See also section UNICODE.

7bit
@@ -583,7 +604,7 @@

Кодирања

Претварање

-

Јуникод текстуалне датотеке могу имати ДОС, Јуникс или мек преломе реда, као обичне текстуалне датотеке.

+

Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files.

Сва издања „dos2unix“-а и „unix2do“-а могу претворити УТФ-8 кодиране датотеке, јер је УТФ-8 дизајниран за повратну сагласност са АСКРИ-ијем.

@@ -603,7 +624,7 @@

Претварање

Ознака редоследа бајтова

-

На Виндоузу Јуникод текстуалне датотеке обично имају Ознаку редоследа бајтова (BOM), јер многи Виндоуз програми (укључујући Бележницу) подразумевано додају ОРБ. Видите такође http://en.wikipedia.org/wiki/Byte_order_mark.

+

On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also https://en.wikipedia.org/wiki/Byte_order_mark.

На Јуниксу Јуникод датотеке обично немају ОРБ. Претпоставља се да су текстуалне датотеке кодиране у језичком кодирању знака.

@@ -643,7 +664,7 @@

Примери Ун

GB18030

-

„GB18030“ је стандард кинеске владе. Обавезни подскуп „GB18030“ стандард се званично захтева за све софтверске производе продате у Кини. Видите такође http://en.wikipedia.org/wiki/GB_18030.

+

GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also https://en.wikipedia.org/wiki/GB_18030.

„GB18030“ је у потпуности сагласан са Јуникод-ом, и може се сматрати Јуникод форматом преображаја. Као УТФ-8, „GB18030“ је сагласан са АСКРИ. „GB18030“ је такође сагласан са Виндоуз кодном страницом 936, познатом и као ГБК.

@@ -742,7 +763,7 @@

ЈЕЗИЧЕЊЕ

export LANG=en_US.iso88591 Енглески, САД, Latin-1 кодирање export LANG=en_GB.UTF-8 Енглески, УК, УТФ-8 кодирање -

За потпун списак језика и шифара држава видите приручник геттекста: http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

+

For a complete list of language and country codes see the gettext manual: https://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

На Јуникс системима можете користити наредбу „locale(1)“ да видите особене податке језика.

@@ -750,7 +771,7 @@

ЈЕЗИЧЕЊЕ

ЈЕЗИК
-

Са променљивом окружења ЈЕЗИК можете навести списак хитности језика. „dos2unix“ даје предност за ЈЕЗИК над ЈЕЗ. На пример, прво холандски а затим немачки: LANGUAGE=nl:de. Прво треба да омогућите преводе, постављајући „LANG“ (или LC_ALL) на вредност другаачију од „C“, пре него ли будете могли да користите списак хитности језика променљивом „LANGUAGE“. Видите такође приручник геттекста: http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

+

With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: LANGUAGE=nl:de. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than "C", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: https://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

Ако изаберете језик који није доступан добићете стандардне поруке на енглеском.

@@ -775,21 +796,21 @@

РЕЗУЛТНА В

СТАНДАРДИ

-

http://en.wikipedia.org/wiki/Text_file

+

https://en.wikipedia.org/wiki/Text_file

-

http://en.wikipedia.org/wiki/Carriage_return

+

https://en.wikipedia.org/wiki/Carriage_return

-

http://en.wikipedia.org/wiki/Newline

+

https://en.wikipedia.org/wiki/Newline

-

http://en.wikipedia.org/wiki/Unicode

+

https://en.wikipedia.org/wiki/Unicode

АУТОРИ

Бенџамин Лин – <blin@socs.uts.edu.au>, Бернд Јоханес Вебен (mac2unix) – <wuebben@kde.org>, Кристијан Вирл (додаје додатни нови ред) – <wurll@ira.uka.de>, Ервин Вотерландер – <waterlan@xs4all.nl> (одржавалац)

-

Страница пројекта: http://waterlan.home.xs4all.nl/dos2unix.html

+

Project page: https://waterlan.home.xs4all.nl/dos2unix.html

-

Страница Ковнице извора: http://sourceforge.net/projects/dos2unix/

+

SourceForge page: https://sourceforge.net/projects/dos2unix/

ВИДИТЕ ТАКОЂЕ

diff --git a/dos2unix/man/sr/man1/dos2unix.pod b/dos2unix/man/sr/man1/dos2unix.pod index 5b5a8d4..17d56ae 100644 --- a/dos2unix/man/sr/man1/dos2unix.pod +++ b/dos2unix/man/sr/man1/dos2unix.pod @@ -63,7 +63,7 @@ dos2unix – претварач формата текстуалних датот =item B<-ascii> -Претвара само преламање реда. Ово је основни режим претварања. +Default conversion mode. See also section CONVERSION MODES. =item B<-iso> @@ -188,6 +188,15 @@ dos2unix – претварач формата текстуалних датот Знајте да понекад бинарна датотека може грешком бити узета за текстуалну датотеку. Видите такође опцију „C<-s>“. +If in addition option C<-e> or C<--add-eol> is used also the type of the line break of the last line is printed, or C if there is none. + +Пример излаза: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Изборне додатне заставице се могу поставити да измене излаз. Могу се додати једна или више заставица. =over 4 @@ -216,12 +225,18 @@ dos2unix – претварач формата текстуалних датот Исписује да ли је датотека текстуална или бинарна. +=item B + +Print the type of the line break of the last line, or C if there is none. + =item B Исписује само датотеке које ће бити претворене. Са заставицом „C“ „dos2unix“ ће исписати само датотеке које садрже ДОС преламања реда, „unix2dos“ ће исписат само називе датотека које имају Јуникс преламања реда. +If in addition option C<-e> or C<--add-eol> is used also the files that lack a line break on the last line will be printed. + =item B Исписује заглавље. @@ -254,6 +269,10 @@ dos2unix – претварач формата текстуалних датот unix2dos -ic *.txt +List the files that have DOS line breaks or lack a line break on the last line: + + dos2unix -e -ic *.txt + Претвара само датотеке које имају ДОС преламање реда и оставља друге датотеке нетакнутим: dos2unix -ic0 *.txt | xargs -0 dos2unix @@ -388,7 +407,7 @@ B: Само Јуникс преламања реда се мењају =head1 МЕК РЕЖИМ -У нормалном режиму преламања реда се претварју из ДОС-а у Јуникс и обратно. Мек преламања реда се не претварају. +By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted. У Мек режиму преламања реда се претварју из Мек-а у Јуникс и обратно. ДОС преламања реда се не мењају. @@ -400,9 +419,9 @@ B: Само Јуникс преламања реда се мењају =item B -У „C“ режиму само преламања реда се претварају. Ово је основни режим претварања. +This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling B mode disables B<7bit> and B mode. -Иако је назив овог режима АСКРИ, што је 7-битни стандард, стварни режим је 8-битни. Увек користите овај режим приликом претварања Јуникод УТФ-8 датотека. +If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has UTF-16 support type C. See also section UNICODE. =item B<7bit> @@ -462,7 +481,7 @@ B: Само Јуникс преламања реда се мењају =head2 Претварање -Јуникод текстуалне датотеке могу имати ДОС, Јуникс или мек преломе реда, као обичне текстуалне датотеке. +Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files. Сва издања „dos2unix“-а и „unix2do“-а могу претворити УТФ-8 кодиране датотеке, јер је УТФ-8 дизајниран за повратну сагласност са АСКРИ-ијем. @@ -482,7 +501,7 @@ B: Само Јуникс преламања реда се мењају =head2 Ознака редоследа бајтова -На Виндоузу Јуникод текстуалне датотеке обично имају Ознаку редоследа бајтова (BOM), јер многи Виндоуз програми (укључујући Бележницу) подразумевано додају ОРБ. Видите такође L. +On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L. На Јуниксу Јуникод датотеке обично немају ОРБ. Претпоставља се да су текстуалне датотеке кодиране у језичком кодирању знака. @@ -522,7 +541,7 @@ B: Само Јуникс преламања реда се мењају =head1 GB18030 -„GB18030“ је стандард кинеске владе. Обавезни подскуп „GB18030“ стандард се званично захтева за све софтверске производе продате у Кини. Видите такође L. +GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L. „GB18030“ је у потпуности сагласан са Јуникод-ом, и може се сматрати Јуникод форматом преображаја. Као УТФ-8, „GB18030“ је сагласан са АСКРИ. „GB18030“ је такође сагласан са Виндоуз кодном страницом 936, познатом и као ГБК. @@ -622,13 +641,13 @@ B: Само Јуникс преламања реда се мењају export LANG=en_US.iso88591 Енглески, САД, Latin-1 кодирање export LANG=en_GB.UTF-8 Енглески, УК, УТФ-8 кодирање -За потпун списак језика и шифара држава видите приручник геттекста: L +For a complete list of language and country codes see the gettext manual: L На Јуникс системима можете користити наредбу „locale(1)“ да видите особене податке језика. =item B<ЈЕЗИК> -Са променљивом окружења ЈЕЗИК можете навести списак хитности језика. „dos2unix“ даје предност за ЈЕЗИК над ЈЕЗ. На пример, прво холандски а затим немачки: C. Прво треба да омогућите преводе, постављајући „LANG“ (или LC_ALL) на вредност другаачију од „C“, пре него ли будете могли да користите списак хитности језика променљивом „LANGUAGE“. Видите такође приручник геттекста: L +With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than "C", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L Ако изаберете језик који није доступан добићете стандардне поруке на енглеском. @@ -654,21 +673,21 @@ B: Само Јуникс преламања реда се мењају =head1 СТАНДАРДИ -L +L -L +L -L +L -L +L =head1 АУТОРИ Бенџамин Лин – , Бернд Јоханес Вебен (mac2unix) – , Кристијан Вирл (додаје додатни нови ред) – , Ервин Вотерландер – (одржавалац) -Страница пројекта: L +Project page: L -Страница Ковнице извора: L +SourceForge page: L =head1 ВИДИТЕ ТАКОЂЕ diff --git a/dos2unix/man/sr/man1/dos2unix.txt b/dos2unix/man/sr/man1/dos2unix.txt index 103cabe..2794ccf 100644 --- a/dos2unix/man/sr/man1/dos2unix.txt +++ b/dos2unix/man/sr/man1/dos2unix.txt @@ -67,7 +67,7 @@ власништва корисника и групе над датотекама. -ascii - Претвара само преламање реда. Ово је основни режим претварања. + Default conversion mode. See also section CONVERSION MODES. -iso Претварање између ДОС и ИСО-8859-1 скупа знакова. Видите такође @@ -214,6 +214,17 @@ Знајте да понекад бинарна датотека може грешком бити узета за текстуалну датотеку. Видите такође опцију „"-s"“. + If in addition option "-e" or "--add-eol" is used also the type of + the line break of the last line is printed, or "noeol" if there is + none. + + Пример излаза: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Изборне додатне заставице се могу поставити да измене излаз. Могу се додати једна или више заставица. @@ -233,12 +244,18 @@ t Исписује да ли је датотека текстуална или бинарна. + e Print the type of the line break of the last line, or "noeol" if + there is none. + c Исписује само датотеке које ће бити претворене. Са заставицом „"c"“ „dos2unix“ ће исписати само датотеке које садрже ДОС преламања реда, „unix2dos“ ће исписат само називе датотека које имају Јуникс преламања реда. + If in addition option "-e" or "--add-eol" is used also the files + that lack a line break on the last line will be printed. + h Исписује заглавље. p Приказује називе датотека без путање. @@ -265,6 +282,11 @@ unix2dos -ic *.txt + List the files that have DOS line breaks or lack a line break on the + last line: + + dos2unix -e -ic *.txt + Претвара само датотеке које имају ДОС преламање реда и оставља друге датотеке нетакнутим: @@ -438,8 +460,8 @@ Приказује податке о издању и излази. МЕК РЕЖИМ - У нормалном режиму преламања реда се претварју из ДОС-а у Јуникс и - обратно. Мек преламања реда се не претварају. + By default line breaks are converted from DOS to Unix and vice versa. + Mac line breaks are not converted. У Мек режиму преламања реда се претварју из Мек-а у Јуникс и обратно. ДОС преламања реда се не мењају. @@ -449,12 +471,16 @@ РЕЖИМИ ПРЕТВАРАЊА ascii - У „"ascii"“ режиму само преламања реда се претварају. Ово је основни - режим претварања. + This is the default conversion mode. This mode is for converting + ASCII and ASCII-compatible encoded files, like UTF-8. Enabling ascii + mode disables 7bit and iso mode. - Иако је назив овог режима АСКРИ, што је 7-битни стандард, стварни - режим је 8-битни. Увек користите овај режим приликом претварања - Јуникод УТФ-8 датотека. + If dos2unix has UTF-16 support, UTF-16 encoded files are converted + to the current locale character encoding on POSIX systems and to + UTF-8 on Windows. Enabling ascii mode disables the option to keep + UTF-16 encoding ("-u") and the options to assume UTF-16 input ("-ul" + and "-ub"). To see if dos2unix has UTF-16 support type "dos2unix + -V". See also section UNICODE. 7bit У овом режиму сви 8 битни не-АСКРИ знаци (са вредностима од 128 до @@ -524,8 +550,8 @@ великој крајности, али су углавном кодиране у УТФ-16 формату. Претварање - Јуникод текстуалне датотеке могу имати ДОС, Јуникс или мек преломе реда, - као обичне текстуалне датотеке. + Unicode text files can have DOS, Unix or Mac line breaks, like ASCII + text files. Сва издања „dos2unix“-а и „unix2do“-а могу претворити УТФ-8 кодиране датотеке, јер је УТФ-8 дизајниран за повратну сагласност са АСКРИ-ијем. @@ -558,10 +584,9 @@ ИСО и 7-битни режим претварања не ради на УТФ-16 датотекама. Ознака редоследа бајтова - На Виндоузу Јуникод текстуалне датотеке обично имају Ознаку редоследа - бајтова (BOM), јер многи Виндоуз програми (укључујући Бележницу) - подразумевано додају ОРБ. Видите такође - . + On Windows Unicode text files typically have a Byte Order Mark (BOM), + because many Windows programs (including Notepad) add BOMs by default. + See also . На Јуниксу Јуникод датотеке обично немају ОРБ. Претпоставља се да су текстуалне датотеке кодиране у језичком кодирању знака. @@ -612,9 +637,9 @@ unix2dos < улаз.txt | iconv -f UTF-8 -t UTF-16 > излаз.txt GB18030 - „GB18030“ је стандард кинеске владе. Обавезни подскуп „GB18030“ стандард - се званично захтева за све софтверске производе продате у Кини. Видите - такође . + GB18030 is a Chinese government standard. A mandatory subset of the + GB18030 standard is officially required for all software products sold + in China. See also . „GB18030“ је у потпуности сагласан са Јуникод-ом, и може се сматрати Јуникод форматом преображаја. Као УТФ-8, „GB18030“ је сагласан са АСКРИ. @@ -728,22 +753,24 @@ GB18030 export LANG=en_US.iso88591 Енглески, САД, Latin-1 кодирање export LANG=en_GB.UTF-8 Енглески, УК, УТФ-8 кодирање - За потпун списак језика и шифара држава видите приручник геттекста: - + For a complete list of language and country codes see the gettext + manual: + На Јуникс системима можете користити наредбу „locale(1)“ да видите особене податке језика. ЈЕЗИК - Са променљивом окружења ЈЕЗИК можете навести списак хитности језика. - „dos2unix“ даје предност за ЈЕЗИК над ЈЕЗ. На пример, прво холандски - а затим немачки: "LANGUAGE=nl:de". Прво треба да омогућите преводе, - постављајући „LANG“ (или LC_ALL) на вредност другаачију од „C“, пре - него ли будете могли да користите списак хитности језика променљивом - „LANGUAGE“. Видите такође приручник геттекста: - + With the LANGUAGE environment variable you can specify a priority + list of languages, separated by colons. Dos2unix gives preference to + LANGUAGE over LANG. For instance, first Dutch and then German: + "LANGUAGE=nl:de". You have to first enable localization, by setting + LANG (or LC_ALL) to a value other than "C", before you can use a + language priority list through the LANGUAGE variable. See also the + gettext manual: + Ако изаберете језик који није доступан добићете стандардне поруке на енглеском. @@ -767,13 +794,13 @@ GB18030 погрешне опције линије наредби. СТАНДАРДИ - + - + - + - + АУТОРИ Бенџамин Лин – , Бернд Јоханес Вебен (mac2unix) – @@ -781,9 +808,9 @@ GB18030 , Ервин Вотерландер – (одржавалац) - Страница пројекта: + Project page: - Страница Ковнице извора: + SourceForge page: ВИДИТЕ ТАКОЂЕ file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/dos2unix/man/sv/man1/dos2unix.1 b/dos2unix/man/sv/man1/dos2unix.1 index 37c3908..cfdc79a 100644 --- a/dos2unix/man/sv/man1/dos2unix.1 +++ b/dos2unix/man/sv/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2023-08-29" "dos2unix" "2023-08-29" +.TH dos2unix 1 "2024-01-22" "dos2unix" "2024-01-22" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -122,7 +122,7 @@ Tillåt ändring av ägarskap för fil i gammalt filläge. När denna flagga används, kommer konverteringen inte att avbrytas när användar\- och/eller gruppägarskap för originalfilen inte kan bevaras i gammalt filläget. Konverteringen kommer att fortsätta och den konverterade filen kommer att få samma nya ägarskap som om den konverterades i nyfilsläge. Se också flaggorna \f(CW\*(C`\-o\*(C'\fR och \f(CW\*(C`\-n\*(C'\fR. Denna flagga är endast tillgänglig om dos2unix har stöd för att bevara användar\- och gruppägarskap för filer. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" -Konvertera enbart radbrytningar. Detta är standardkonverteringsläget. +Standardkonverteringsläge. Se vidare stycket KONVERTERINGSLÄGEN. .IP "\fB\-iso\fR" 4 .IX Item "-iso" Konvertering mellan \s-1DOS\-\s0 och ISO\-8859\-1\-teckentabeller. Se vidare stycket KONVERTERINGSLÄGEN. @@ -224,6 +224,17 @@ Exempelutmatning: .Sp Notera att en binärfil ibland kan misstas för en textfil. Se vidare flaggan \f(CW\*(C`\-s\*(C'\fR. .Sp +Om dessutom flaggan \f(CW\*(C`\-e\*(C'\fR eller \f(CW\*(C`\-\-add\-eol\*(C'\fR används så kommer även den radbrytning som används på sista raden att skrivas ut, eller \f(CW\*(C`noeol\*(C'\fR om det inte finns någon. +.Sp +Exempelutmatning: +.Sp +.Vb 4 +\& 6 0 0 no_bom text dos dos.txt +\& 0 6 0 no_bom text unix unix.txt +\& 0 0 6 no_bom text mac mac.txt +\& 1 0 0 no_bom text noeol noeol_dos.txt +.Ve +.Sp Extra flaggor kan användas valfritt för att ändra utmatningen. En eller fler flaggor kan läggas till. .RS 4 .IP "\fB0\fR" 4 @@ -244,11 +255,16 @@ Skriv ut byteordningsmarkeringen. .IP "\fBt\fR" 4 .IX Item "t" Skriv ut om filen är text eller binär. +.IP "\fBe\fR" 4 +.IX Item "e" +Skriv ut radbrytningstypen på sista raden, eller \f(CW\*(C`noeol\*(C'\fR om det inte finns någon. .IP "\fBc\fR" 4 .IX Item "c" Skriv bara ut filerna som skulle ha konverterats. .Sp Med \f(CW\*(C`c\*(C'\fR\-flaggan kommer dos2unix att skriva ut filerna som innehåller DOS-radbrytningar, unix2dos kommer bara att skriva ut filnamn som har Unix-radbrytningar. +.Sp +Om dessutom flaggan \f(CW\*(C`\-e\*(C'\fR eller \f(CW\*(C`\-\-add\-eol\*(C'\fR används så kommer även filer som saknar en radbrytning på sista raden att skrivas ut. .IP "\fBh\fR" 4 .IX Item "h" Skriv ut rubrik. @@ -290,6 +306,12 @@ Lista filerna som har Unix-radbrytningar: \& unix2dos \-ic *.txt .Ve .Sp +Lista filerna som har DOS-radbrytningar eller saknar en radbrytning på sista raden: +.Sp +.Vb 1 +\& dos2unix \-e \-ic *.txt +.Ve +.Sp Konvertera endast filer som har DOS-radbrytningar och lämna övriga filer orörda: .Sp .Vb 1 @@ -410,7 +432,7 @@ Behåll symboliska länkar och mål oförändrade (standard). Visa versionsinformation och avsluta. .SH "MAC\-LÄGE" .IX Header "MAC-LÄGE" -I normalläge konverteras radbrytningar från \s-1DOS\s0 till Unix och vice versa. Mac-radbrytningar konverteras inte. +Som standard konverteras radbrytningar från \s-1DOS\s0 till Unix och vice versa. Mac-radbrytningar konverteras inte. .PP I Mac\-läge konverteras radbrytningar från Mac till Unix och vice versa. DOS-radbrytningar ändras ej. .PP @@ -419,9 +441,9 @@ För att köra i Mac\-läge använd kommandoradsflaggan \f(CW\*(C`\-c mac\*(C'\f .IX Header "KONVERTERINGSLÄGEN" .IP "\fBascii\fR" 4 .IX Item "ascii" -I läget \f(CW\*(C`ascii\*(C'\fR konverteras enbart radbrytningar. Detta är standardkonverteringsläget. +Detta är standardkonverteringsläget. Detta läge används för att konvertera \s-1ASCII\s0 och ASCII-kompatibla kodade filer, så som \s-1UTF\-8.\s0 Att aktiveras \fBascii\fR\-läge inaktiverar \fB7bit\fR\- och \fBiso\fR\-läge. .Sp -Även om namnet på detta läge är \s-1ASCII,\s0 vilket är en 7\-bitarsstandard, så är det läget egentligen ett 8\-bitarsläge. Använd alltid detta läge vid konvertering av Unicode UTF\-8\-filer. +Om dos2unix har \s-1UTF\-16\s0 stöd kommer UTF\-16\-kodade filer att konverteras till kodningen för den aktuella lokalen på POSIX-sytstem och till \s-1UTF\-8\s0 på Windows. Aktivering av \fBascii\fR\-läget inaktiverar flaggan för att behålla UTF\-16\-kodning (\f(CW\*(C`\-u\*(C'\fR) och flaggorna för att anta \s-1UTF\-16\s0 indata (\f(CW\*(C`\-ul\*(C'\fR och \f(CW\*(C`\-ub\*(C'\fR). För att se om dos2unix har UTF\-16\-stöd skriv \f(CW\*(C`dox2unix \-V\*(C'\fR, se också avsnittet \s-1UNICODE.\s0 .IP "\fB7bit\fR" 4 .IX Item "7bit" I detta läge konverteras alla 8\-bitars icke-ASCII tecken (med värden från 128 till 255) till ett 7\-bitars blanksteg. @@ -491,7 +513,7 @@ Se även och . +I Windows har Unicode-textfiler typiskt en byteordningsmarkering (Byte Order Mark, \s-1BOM\s0) eftersom många Windows-program (inklusive Notepad) lägger till BOM:ar som standard. Se även . .PP I Unix har Unicode-textfiler typiskt ingen \s-1BOM.\s0 Filer antas vara kodade i den lokala teckenuppsättningen. .PP @@ -555,7 +577,7 @@ Konvertera från Unix \s-1UTF\-8\s0 till Windows \s-1UTF\-16:\s0 .Ve .SH "GB18030" .IX Header "GB18030" -\&\s-1GB18030\s0 är en standard från Kinesiska regeringen. En obligatorisk delmängd av standarden \s-1GB18030\s0 krävs officiellt för alla programvaruprodukter som säljs i Kina. Se vidare . +\&\s-1GB18030\s0 är en standard från Kinesiska regeringen. En obligatorisk delmängd av standarden \s-1GB18030\s0 krävs officiellt för alla programvaruprodukter som säljs i Kina. Se vidare . .PP \&\s-1GB18030\s0 är fullständigt kompatibel med Unicode och kan anses vara ett överföringsformat för unicode. Precis som \s-1UTF\-8\s0 är \s-1GB18030\s0 kompatibel med \s-1ASCII. GB18030\s0 är också kompatibel med Windows-teckentabell 936, också känd som \s-1GBK.\s0 .PP @@ -680,12 +702,12 @@ Det primära språket väljs med miljövariabeln \s-1LANG.\s0 LANG-variabeln bes \& export LANG=en_GB.UTF\-8 Engelska, UK, UTF\-8\-kodning .Ve .Sp -För en fullständig lista över språk och landskoder se vidare i gettext-manualen: +För en fullständig lista över språk och landskoder se vidare i gettext-manualen: .Sp På Unix-system kan du använda kommando \fBlocale\fR\|(1) för att få lokal-specifik information. .IP "\fB\s-1LANGUAGE\s0\fR" 4 .IX Item "LANGUAGE" -Med miljövariabeln \s-1LANGUAGE\s0 kan du ange en prioritetslista över språk, separerade med kolon. Dos2unix kommer att ge företräde till \s-1LANGAUGE\s0 över \s-1LANG.\s0 Exempelvis först nederländska och sedan tyska: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. Du måste först ha aktiverat lokalisering, genom att sätta \s-1LANG\s0 (eller \s-1LC_ALL\s0) till ett värde annat än “C“, innan du kan använda en prioritetslista för språk via LANGUAGE-variabeln. Se vidare i gettext-manualen: +Med miljövariabeln \s-1LANGUAGE\s0 kan du ange en prioritetslista över språk, separerade med kolon. Dos2unix kommer att ge företräde till \s-1LANGAUGE\s0 över \s-1LANG.\s0 Exempelvis först nederländska och sedan tyska: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. Du måste först ha aktiverat lokalisering, genom att sätta \s-1LANG\s0 (eller \s-1LC_ALL\s0) till ett värde annat än “C“, innan du kan använda en prioritetslista för språk via LANGUAGE-variabeln. Se vidare i gettext-manualen: .Sp Om du väljer ett språk som inte är tillgänglig kommer du att få engelska meddelanden som standard. .IP "\fB\s-1DOS2UNIX_LOCALEDIR\s0\fR" 4 @@ -704,20 +726,20 @@ Om allt går bra kommer noll att returneras. När ett systemfel uppstår kommer Returvärdet är alltid noll i tyst läge, utom när felaktiga kommandoradsflaggor används. .SH "STANDARDER" .IX Header "STANDARDER" - + .PP - + .PP - + .PP - + .SH "FÖRFATTARE" .IX Header "FÖRFATTARE" Benjamin Lin \- , Bernd Johannes Wuebben (mac2unix\-läge) \- , Christian Wurll (lägg till en extra radbrytning) \- , Erwin Waterlander \- (upphovsman) .PP -Projektsida: +Projektsida: .PP -SourceForge-sida: +SourceForge-sida: .SH "SE ÄVEN" .IX Header "SE ÄVEN" \&\fBfile\fR\|(1) \fBfind\fR\|(1) \fBiconv\fR\|(1) \fBlocale\fR\|(1) \fBxargs\fR\|(1) diff --git a/dos2unix/man/sv/man1/dos2unix.htm b/dos2unix/man/sv/man1/dos2unix.htm index e1e3d4f..48ba3ae 100644 --- a/dos2unix/man/sv/man1/dos2unix.htm +++ b/dos2unix/man/sv/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.5.1 - textfilsformatskonverterare från DOS/Mac till Unix och vice versa +dos2unix 7.5.2 - textfilsformatskonverterare från DOS/Mac till Unix och vice versa @@ -89,7 +89,7 @@

FLAGGOR

-ascii
-

Konvertera enbart radbrytningar. Detta är standardkonverteringsläget.

+

Standardkonverteringsläge. Se vidare stycket KONVERTERINGSLÄGEN.

-iso
@@ -246,6 +246,15 @@

FLAGGOR

Notera att en binärfil ibland kan misstas för en textfil. Se vidare flaggan -s.

+

Om dessutom flaggan -e eller --add-eol används så kommer även den radbrytning som används på sista raden att skrivas ut, eller noeol om det inte finns någon.

+ +

Exempelutmatning:

+ +
6       0       0  no_bom    text   dos     dos.txt
+0       6       0  no_bom    text   unix    unix.txt
+0       0       6  no_bom    text   mac     mac.txt
+1       0       0  no_bom    text   noeol   noeol_dos.txt
+

Extra flaggor kan användas valfritt för att ändra utmatningen. En eller fler flaggor kan läggas till.

@@ -285,6 +294,12 @@

FLAGGOR

Skriv ut om filen är text eller binär.

+ +
e
+
+ +

Skriv ut radbrytningstypen på sista raden, eller noeol om det inte finns någon.

+
c
@@ -293,6 +308,8 @@

FLAGGOR

Med c-flaggan kommer dos2unix att skriva ut filerna som innehåller DOS-radbrytningar, unix2dos kommer bara att skriva ut filnamn som har Unix-radbrytningar.

+

Om dessutom flaggan -e eller --add-eol används så kommer även filer som saknar en radbrytning på sista raden att skrivas ut.

+
h
@@ -330,6 +347,10 @@

FLAGGOR

unix2dos -ic *.txt
+

Lista filerna som har DOS-radbrytningar eller saknar en radbrytning på sista raden:

+ +
dos2unix -e -ic *.txt
+

Konvertera endast filer som har DOS-radbrytningar och lämna övriga filer orörda:

dos2unix -ic0 *.txt | xargs -0 dos2unix
@@ -503,7 +524,7 @@

FLAGGOR

MAC-LÄGE

-

I normalläge konverteras radbrytningar från DOS till Unix och vice versa. Mac-radbrytningar konverteras inte.

+

Som standard konverteras radbrytningar från DOS till Unix och vice versa. Mac-radbrytningar konverteras inte.

I Mac-läge konverteras radbrytningar från Mac till Unix och vice versa. DOS-radbrytningar ändras ej.

@@ -516,9 +537,9 @@

KONVERTERINGSLÄGEN

ascii
-

I läget ascii konverteras enbart radbrytningar. Detta är standardkonverteringsläget.

+

Detta är standardkonverteringsläget. Detta läge används för att konvertera ASCII och ASCII-kompatibla kodade filer, så som UTF-8. Att aktiveras ascii-läge inaktiverar 7bit- och iso-läge.

-

Även om namnet på detta läge är ASCII, vilket är en 7-bitarsstandard, så är det läget egentligen ett 8-bitarsläge. Använd alltid detta läge vid konvertering av Unicode UTF-8-filer.

+

Om dos2unix har UTF-16 stöd kommer UTF-16-kodade filer att konverteras till kodningen för den aktuella lokalen på POSIX-sytstem och till UTF-8 på Windows. Aktivering av ascii-läget inaktiverar flaggan för att behålla UTF-16-kodning (-u) och flaggorna för att anta UTF-16 indata (-ul och -ub). För att se om dos2unix har UTF-16-stöd skriv dox2unix -V, se också avsnittet UNICODE.

7bit
@@ -583,7 +604,7 @@

Kodningar

Konvertering

-

Unicode-textfiler kan ha DOS, Unix eller Mac-radbrytningar precis som vanliga textfiler.

+

Unicode-textfiler kan ha DOS, Unix eller Mac-radbrytningar precis som ASCII-textfiler.

Alla versioner av dos2unix och unix2dos kan konvertera UTF-8-kodade filer, eftersom UTF-8 designades för bakåtkompatibilitet med ASCII.

@@ -603,7 +624,7 @@

Konvertering

Byteordningsmarkering (Byte Order Mark)

-

I Windows har Unicode-textfiler typiskt en byteordningsmarkering (Byte Order Mark, BOM) eftersom många Windows-program (inklusive Notepad) lägger till BOM:ar som standard. Se även http://en.wikipedia.org/wiki/Byte_order_mark.

+

I Windows har Unicode-textfiler typiskt en byteordningsmarkering (Byte Order Mark, BOM) eftersom många Windows-program (inklusive Notepad) lägger till BOM:ar som standard. Se även https://en.wikipedia.org/wiki/Byte_order_mark.

I Unix har Unicode-textfiler typiskt ingen BOM. Filer antas vara kodade i den lokala teckenuppsättningen.

@@ -643,7 +664,7 @@

Unicode-exempel

GB18030

-

GB18030 är en standard från Kinesiska regeringen. En obligatorisk delmängd av standarden GB18030 krävs officiellt för alla programvaruprodukter som säljs i Kina. Se vidare http://en.wikipedia.org/wiki/GB_18030.

+

GB18030 är en standard från Kinesiska regeringen. En obligatorisk delmängd av standarden GB18030 krävs officiellt för alla programvaruprodukter som säljs i Kina. Se vidare https://en.wikipedia.org/wiki/GB_18030.

GB18030 är fullständigt kompatibel med Unicode och kan anses vara ett överföringsformat för unicode. Precis som UTF-8 är GB18030 kompatibel med ASCII. GB18030 är också kompatibel med Windows-teckentabell 936, också känd som GBK.

@@ -742,7 +763,7 @@

LOKALISERING

export LANG=en_US.iso88591 Engelska, USA, Latin-1-kodning export LANG=en_GB.UTF-8 Engelska, UK, UTF-8-kodning -

För en fullständig lista över språk och landskoder se vidare i gettext-manualen: http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

+

För en fullständig lista över språk och landskoder se vidare i gettext-manualen: https://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

På Unix-system kan du använda kommando locale(1) för att få lokal-specifik information.

@@ -750,7 +771,7 @@

LOKALISERING

LANGUAGE
-

Med miljövariabeln LANGUAGE kan du ange en prioritetslista över språk, separerade med kolon. Dos2unix kommer att ge företräde till LANGAUGE över LANG. Exempelvis först nederländska och sedan tyska: LANGUAGE=nl:de. Du måste först ha aktiverat lokalisering, genom att sätta LANG (eller LC_ALL) till ett värde annat än “C“, innan du kan använda en prioritetslista för språk via LANGUAGE-variabeln. Se vidare i gettext-manualen: http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

+

Med miljövariabeln LANGUAGE kan du ange en prioritetslista över språk, separerade med kolon. Dos2unix kommer att ge företräde till LANGAUGE över LANG. Exempelvis först nederländska och sedan tyska: LANGUAGE=nl:de. Du måste först ha aktiverat lokalisering, genom att sätta LANG (eller LC_ALL) till ett värde annat än “C“, innan du kan använda en prioritetslista för språk via LANGUAGE-variabeln. Se vidare i gettext-manualen: https://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

Om du väljer ett språk som inte är tillgänglig kommer du att få engelska meddelanden som standard.

@@ -775,21 +796,21 @@

RETURVÄRDE

STANDARDER

-

http://en.wikipedia.org/wiki/Text_file

+

https://en.wikipedia.org/wiki/Text_file

-

http://en.wikipedia.org/wiki/Carriage_return

+

https://en.wikipedia.org/wiki/Carriage_return

-

http://en.wikipedia.org/wiki/Newline

+

https://en.wikipedia.org/wiki/Newline

-

http://en.wikipedia.org/wiki/Unicode

+

https://en.wikipedia.org/wiki/Unicode

FÖRFATTARE

Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix-läge) - <wuebben@kde.org>, Christian Wurll (lägg till en extra radbrytning) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (upphovsman)

-

Projektsida: http://waterlan.home.xs4all.nl/dos2unix.html

+

Projektsida: https://waterlan.home.xs4all.nl/dos2unix.html

-

SourceForge-sida: http://sourceforge.net/projects/dos2unix/

+

SourceForge-sida: https://sourceforge.net/projects/dos2unix/

SE ÄVEN

diff --git a/dos2unix/man/sv/man1/dos2unix.pod b/dos2unix/man/sv/man1/dos2unix.pod index 693ef66..3850af5 100644 --- a/dos2unix/man/sv/man1/dos2unix.pod +++ b/dos2unix/man/sv/man1/dos2unix.pod @@ -63,7 +63,7 @@ När denna flagga används, kommer konverteringen inte att avbrytas när använd =item B<-ascii> -Konvertera enbart radbrytningar. Detta är standardkonverteringsläget. +Standardkonverteringsläge. Se vidare stycket KONVERTERINGSLÄGEN. =item B<-iso> @@ -188,6 +188,15 @@ Exempelutmatning: Notera att en binärfil ibland kan misstas för en textfil. Se vidare flaggan C<-s>. +Om dessutom flaggan C<-e> eller C<--add-eol> används så kommer även den radbrytning som används på sista raden att skrivas ut, eller C om det inte finns någon. + +Exempelutmatning: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Extra flaggor kan användas valfritt för att ändra utmatningen. En eller fler flaggor kan läggas till. =over 4 @@ -216,12 +225,18 @@ Skriv ut byteordningsmarkeringen. Skriv ut om filen är text eller binär. +=item B + +Skriv ut radbrytningstypen på sista raden, eller C om det inte finns någon. + =item B Skriv bara ut filerna som skulle ha konverterats. Med C-flaggan kommer dos2unix att skriva ut filerna som innehåller DOS-radbrytningar, unix2dos kommer bara att skriva ut filnamn som har Unix-radbrytningar. +Om dessutom flaggan C<-e> eller C<--add-eol> används så kommer även filer som saknar en radbrytning på sista raden att skrivas ut. + =item B Skriv ut rubrik. @@ -254,6 +269,10 @@ Lista filerna som har Unix-radbrytningar: unix2dos -ic *.txt +Lista filerna som har DOS-radbrytningar eller saknar en radbrytning på sista raden: + + dos2unix -e -ic *.txt + Konvertera endast filer som har DOS-radbrytningar och lämna övriga filer orörda: dos2unix -ic0 *.txt | xargs -0 dos2unix @@ -388,7 +407,7 @@ Visa versionsinformation och avsluta. =head1 MAC-LÄGE -I normalläge konverteras radbrytningar från DOS till Unix och vice versa. Mac-radbrytningar konverteras inte. +Som standard konverteras radbrytningar från DOS till Unix och vice versa. Mac-radbrytningar konverteras inte. I Mac-läge konverteras radbrytningar från Mac till Unix och vice versa. DOS-radbrytningar ändras ej. @@ -400,9 +419,9 @@ För att köra i Mac-läge använd kommandoradsflaggan C<-c mac> eller använd k =item B -I läget C konverteras enbart radbrytningar. Detta är standardkonverteringsläget. +Detta är standardkonverteringsläget. Detta läge används för att konvertera ASCII och ASCII-kompatibla kodade filer, så som UTF-8. Att aktiveras B-läge inaktiverar B<7bit>- och B-läge. -Även om namnet på detta läge är ASCII, vilket är en 7-bitarsstandard, så är det läget egentligen ett 8-bitarsläge. Använd alltid detta läge vid konvertering av Unicode UTF-8-filer. +Om dos2unix har UTF-16 stöd kommer UTF-16-kodade filer att konverteras till kodningen för den aktuella lokalen på POSIX-sytstem och till UTF-8 på Windows. Aktivering av B-läget inaktiverar flaggan för att behålla UTF-16-kodning (C<-u>) och flaggorna för att anta UTF-16 indata (C<-ul> och C<-ub>). För att se om dos2unix har UTF-16-stöd skriv C, se också avsnittet UNICODE. =item B<7bit> @@ -462,7 +481,7 @@ Det finns flera olika Unicode kodningar. I Unix och Linux kodas filer vanligtvis =head2 Konvertering -Unicode-textfiler kan ha DOS, Unix eller Mac-radbrytningar precis som vanliga textfiler. +Unicode-textfiler kan ha DOS, Unix eller Mac-radbrytningar precis som ASCII-textfiler. Alla versioner av dos2unix och unix2dos kan konvertera UTF-8-kodade filer, eftersom UTF-8 designades för bakåtkompatibilitet med ASCII. @@ -482,7 +501,7 @@ ISO- och 7-bitarslägeskonvertering fungerar inte på UTF-16-filer. =head2 Byteordningsmarkering (Byte Order Mark) -I Windows har Unicode-textfiler typiskt en byteordningsmarkering (Byte Order Mark, BOM) eftersom många Windows-program (inklusive Notepad) lägger till BOM:ar som standard. Se även L. +I Windows har Unicode-textfiler typiskt en byteordningsmarkering (Byte Order Mark, BOM) eftersom många Windows-program (inklusive Notepad) lägger till BOM:ar som standard. Se även L. I Unix har Unicode-textfiler typiskt ingen BOM. Filer antas vara kodade i den lokala teckenuppsättningen. @@ -522,7 +541,7 @@ Konvertera från Unix UTF-8 till Windows UTF-16: =head1 GB18030 -GB18030 är en standard från Kinesiska regeringen. En obligatorisk delmängd av standarden GB18030 krävs officiellt för alla programvaruprodukter som säljs i Kina. Se vidare L. +GB18030 är en standard från Kinesiska regeringen. En obligatorisk delmängd av standarden GB18030 krävs officiellt för alla programvaruprodukter som säljs i Kina. Se vidare L. GB18030 är fullständigt kompatibel med Unicode och kan anses vara ett överföringsformat för unicode. Precis som UTF-8 är GB18030 kompatibel med ASCII. GB18030 är också kompatibel med Windows-teckentabell 936, också känd som GBK. @@ -622,13 +641,13 @@ Det primära språket väljs med miljövariabeln LANG. LANG-variabeln består av export LANG=en_US.iso88591 Engelska, USA, Latin-1-kodning export LANG=en_GB.UTF-8 Engelska, UK, UTF-8-kodning -För en fullständig lista över språk och landskoder se vidare i gettext-manualen: L +För en fullständig lista över språk och landskoder se vidare i gettext-manualen: L På Unix-system kan du använda kommando locale(1) för att få lokal-specifik information. =item B -Med miljövariabeln LANGUAGE kan du ange en prioritetslista över språk, separerade med kolon. Dos2unix kommer att ge företräde till LANGAUGE över LANG. Exempelvis först nederländska och sedan tyska: C. Du måste först ha aktiverat lokalisering, genom att sätta LANG (eller LC_ALL) till ett värde annat än “C“, innan du kan använda en prioritetslista för språk via LANGUAGE-variabeln. Se vidare i gettext-manualen: L +Med miljövariabeln LANGUAGE kan du ange en prioritetslista över språk, separerade med kolon. Dos2unix kommer att ge företräde till LANGAUGE över LANG. Exempelvis först nederländska och sedan tyska: C. Du måste först ha aktiverat lokalisering, genom att sätta LANG (eller LC_ALL) till ett värde annat än “C“, innan du kan använda en prioritetslista för språk via LANGUAGE-variabeln. Se vidare i gettext-manualen: L Om du väljer ett språk som inte är tillgänglig kommer du att få engelska meddelanden som standard. @@ -654,21 +673,21 @@ Returvärdet är alltid noll i tyst läge, utom när felaktiga kommandoradsflagg =head1 STANDARDER -L +L -L +L -L +L -L +L =head1 FÖRFATTARE Benjamin Lin - , Bernd Johannes Wuebben (mac2unix-läge) - , Christian Wurll (lägg till en extra radbrytning) - , Erwin Waterlander - (upphovsman) -Projektsida: L +Projektsida: L -SourceForge-sida: L +SourceForge-sida: L =head1 SE ÄVEN diff --git a/dos2unix/man/sv/man1/dos2unix.txt b/dos2unix/man/sv/man1/dos2unix.txt index cbf09db..e4096d6 100644 --- a/dos2unix/man/sv/man1/dos2unix.txt +++ b/dos2unix/man/sv/man1/dos2unix.txt @@ -66,8 +66,7 @@ FLAGGOR användar- och gruppägarskap för filer. -ascii - Konvertera enbart radbrytningar. Detta är - standardkonverteringsläget. + Standardkonverteringsläge. Se vidare stycket KONVERTERINGSLÄGEN. -iso Konvertering mellan DOS- och ISO-8859-1-teckentabeller. Se vidare @@ -217,6 +216,17 @@ FLAGGOR Notera att en binärfil ibland kan misstas för en textfil. Se vidare flaggan "-s". + Om dessutom flaggan "-e" eller "--add-eol" används så kommer även + den radbrytning som används på sista raden att skrivas ut, eller + "noeol" om det inte finns någon. + + Exempelutmatning: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Extra flaggor kan användas valfritt för att ändra utmatningen. En eller fler flaggor kan läggas till. @@ -236,12 +246,19 @@ FLAGGOR t Skriv ut om filen är text eller binär. + e Skriv ut radbrytningstypen på sista raden, eller "noeol" om det + inte finns någon. + c Skriv bara ut filerna som skulle ha konverterats. Med "c"-flaggan kommer dos2unix att skriva ut filerna som innehåller DOS-radbrytningar, unix2dos kommer bara att skriva ut filnamn som har Unix-radbrytningar. + Om dessutom flaggan "-e" eller "--add-eol" används så kommer + även filer som saknar en radbrytning på sista raden att skrivas + ut. + h Skriv ut rubrik. p Visa filnamn utan sökväg. @@ -268,6 +285,11 @@ FLAGGOR unix2dos -ic *.txt + Lista filerna som har DOS-radbrytningar eller saknar en radbrytning + på sista raden: + + dos2unix -e -ic *.txt + Konvertera endast filer som har DOS-radbrytningar och lämna övriga filer orörda: @@ -443,7 +465,7 @@ FLAGGOR Visa versionsinformation och avsluta. MAC-LÄGE - I normalläge konverteras radbrytningar från DOS till Unix och vice + Som standard konverteras radbrytningar från DOS till Unix och vice versa. Mac-radbrytningar konverteras inte. I Mac-läge konverteras radbrytningar från Mac till Unix och vice versa. @@ -454,12 +476,16 @@ MAC-LÄGE KONVERTERINGSLÄGEN ascii - I läget "ascii" konverteras enbart radbrytningar. Detta är - standardkonverteringsläget. + Detta är standardkonverteringsläget. Detta läge används för att + konvertera ASCII och ASCII-kompatibla kodade filer, så som UTF-8. + Att aktiveras ascii-läge inaktiverar 7bit- och iso-läge. - Även om namnet på detta läge är ASCII, vilket är en - 7-bitarsstandard, så är det läget egentligen ett 8-bitarsläge. - Använd alltid detta läge vid konvertering av Unicode UTF-8-filer. + Om dos2unix har UTF-16 stöd kommer UTF-16-kodade filer att + konverteras till kodningen för den aktuella lokalen på POSIX-sytstem + och till UTF-8 på Windows. Aktivering av ascii-läget inaktiverar + flaggan för att behålla UTF-16-kodning ("-u") och flaggorna för att + anta UTF-16 indata ("-ul" och "-ub"). För att se om dos2unix har + UTF-16-stöd skriv "dox2unix -V", se också avsnittet UNICODE. 7bit I detta läge konverteras alla 8-bitars icke-ASCII tecken (med värden @@ -530,7 +556,7 @@ UNICODE Konvertering Unicode-textfiler kan ha DOS, Unix eller Mac-radbrytningar precis som - vanliga textfiler. + ASCII-textfiler. Alla versioner av dos2unix och unix2dos kan konvertera UTF-8-kodade filer, eftersom UTF-8 designades för bakåtkompatibilitet med ASCII. @@ -566,7 +592,7 @@ UNICODE I Windows har Unicode-textfiler typiskt en byteordningsmarkering (Byte Order Mark, BOM) eftersom många Windows-program (inklusive Notepad) lägger till BOM:ar som standard. Se även - . + . I Unix har Unicode-textfiler typiskt ingen BOM. Filer antas vara kodade i den lokala teckenuppsättningen. @@ -619,7 +645,7 @@ GB18030 GB18030 är en standard från Kinesiska regeringen. En obligatorisk delmängd av standarden GB18030 krävs officiellt för alla programvaruprodukter som säljs i Kina. Se vidare - . + . GB18030 är fullständigt kompatibel med Unicode och kan anses vara ett överföringsformat för unicode. Precis som UTF-8 är GB18030 kompatibel @@ -735,8 +761,8 @@ LOKALISERING För en fullständig lista över språk och landskoder se vidare i gettext-manualen: - + På Unix-system kan du använda kommando locale(1) för att få lokal-specifik information. @@ -749,8 +775,8 @@ LOKALISERING att sätta LANG (eller LC_ALL) till ett värde annat än “C“, innan du kan använda en prioritetslista för språk via LANGUAGE-variabeln. Se vidare i gettext-manualen: - + Om du väljer ett språk som inte är tillgänglig kommer du att få engelska meddelanden som standard. @@ -775,13 +801,13 @@ RETURVÄRDE kommandoradsflaggor används. STANDARDER - + - + - + - + FÖRFATTARE Benjamin Lin - , Bernd Johannes Wuebben @@ -789,9 +815,9 @@ FÖRFATTARE radbrytning) - , Erwin Waterlander - (upphovsman) - Projektsida: + Projektsida: - SourceForge-sida: + SourceForge-sida: SE ÄVEN file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/dos2unix/man/uk/man1/dos2unix.1 b/dos2unix/man/uk/man1/dos2unix.1 index f9a481d..9f21035 100644 --- a/dos2unix/man/uk/man1/dos2unix.1 +++ b/dos2unix/man/uk/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2023-08-29" "dos2unix" "2023-08-29" +.TH dos2unix 1 "2024-01-22" "dos2unix" "2024-01-22" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -122,7 +122,7 @@ dos2unix \- програма для перетворення даних у те Якщо використано цей параметр, перетворення не перериватиметься, якщо у старому режимі файлів не вдасться зберегти параметри належності файла до певного користувача і/або групи. Перетворення продовжуватиметься, а перетворений файл матиме нові параметри власника, такі, наче його перетворено у новому режимі файлів. Див. також параметри \f(CW\*(C`\-o\*(C'\fR і \f(CW\*(C`\-n\*(C'\fR. Цим параметром можна скористатися, лише якщо у dos2unix передбачено підтримку збереження параметрів належності файлів певним користувачам і групам. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" -Виконати лише перетворення символів розриву рядків. Типовий режим перетворення. +Типовий режим перетворення. Див. також розділ щодо режимів перетворення. .IP "\fB\-iso\fR" 4 .IX Item "-iso" Виконати перетворення з кодування \s-1DOS\s0 на кодування \s-1ISO\-8859\-1.\s0 Див. розділ щодо режимів перетворення. @@ -224,6 +224,17 @@ dos2unix \- програма для перетворення даних у те .Sp Зауважте, що іноді бінарні файли помилково розпізнаються як текстові. Див. також параметр \f(CW\*(C`\-s\*(C'\fR. .Sp +Якщо використано додатковий параметр \f(CW\*(C`\-e\*(C'\fR або \f(CW\*(C`\-\-add\-eol\*(C'\fR, буде також виведено дані щодо типу розриву рядків для останнього рядка або \f(CW\*(C`noeol\*(C'\fR, якщо такого немає. +.Sp +Приклад результатів: +.Sp +.Vb 4 +\& 6 0 0 no_bom text dos dos.txt +\& 0 6 0 no_bom text unix unix.txt +\& 0 0 6 no_bom text mac mac.txt +\& 1 0 0 no_bom text noeol noeol_dos.txt +.Ve +.Sp Крім того, можна вказати додаткові прапорці для внесення змін у виведені дані. Можна використовувати один або декілька таких прапорців. .RS 4 .IP "\fB0\fR" 4 @@ -244,11 +255,16 @@ dos2unix \- програма для перетворення даних у те .IP "\fBt\fR" 4 .IX Item "t" Вивести дані щодо того, є файл текстовим чи бінарним. +.IP "\fBe\fR" 4 +.IX Item "e" +Вивести тип розриву рядка в останньому рядку або \f(CW\*(C`noeol\*(C'\fR, якщо останній рядок не містить розриву рядка. .IP "\fBc\fR" 4 .IX Item "c" Вивести дані лише тих файлів, які було б перетворено. .Sp Із прапорцем \f(CW\*(C`c\*(C'\fR dos2unix виведе лише назви файлів, у яких містяться розриви рядків \s-1DOS.\s0 unix2dos виведе лише назви файлів, у яких містяться розриви рядків Unix. +.Sp +Якщо використано додатковий параметр \f(CW\*(C`\-e\*(C'\fR або \f(CW\*(C`\-\-add\-eol\*(C'\fR, буде також виведено список файлів, які не містять символу розриву рядка в останньому рядку. .IP "\fBh\fR" 4 .IX Item "h" Вивести заголовок. @@ -290,6 +306,12 @@ dos2unix \- програма для перетворення даних у те \& unix2dos \-ic *.txt .Ve .Sp +Вивести список файлів, у яких є символи розриву рядків \s-1DOS\s0 або якы не містять символу розриву рядка в останньому рядку: +.Sp +.Vb 1 +\& dos2unix \-e \-ic *.txt +.Ve +.Sp Перетворити лише файли із розривами рядків \s-1DOS\s0 і не чіпати інших файлів: .Sp .Vb 1 @@ -410,7 +432,7 @@ dos2unix \- програма для перетворення даних у те Вивести дані щодо версії і завершити роботу. .SH "РЕЖИМ MAC" .IX Header "РЕЖИМ MAC" -У звичайному режимі розриви рядків \s-1DOS\s0 перетворюються на розриви рядків Unix, і навпаки. Розриви рядків Mac перетворенню не підлягають. +Типово, розриви рядків \s-1DOS\s0 перетворюються на розриви рядків Unix, і навпаки. Розриви рядків Mac перетворенню не підлягають. .PP У режимі Mac розриви рядків Mac перетворюються на розриви рядків Unix, і навпаки. Розриви рядків \s-1DOS\s0 перетворенню не підлягають. .PP @@ -419,9 +441,9 @@ dos2unix \- програма для перетворення даних у те .IX Header "РЕЖИМИ ПЕРЕТВОРЕННЯ" .IP "\fBascii\fR" 4 .IX Item "ascii" -У режимі \f(CW\*(C`ascii\*(C'\fR виконуватиметься лише перетворення символів розриву рядків. Цей режим є типовим режимом перетворення. +Це типовий режим перетворення. Цей режим призначено для перетворення файлів у кодуванні \s-1ASCII\s0 або сумісному з \s-1ASCII\s0 кодуванні, зокрема \s-1UTF\-8.\s0 Вмикання режиму \fBascii\fR вимикає режим \fB7bit\fR і \fBiso\fR. .Sp -Хоча цей режим і називається режимом \s-1ASCII\s0 (стандарту 7\-бітового кодування), насправді кодування символів у ньому є 8\-бітовим. Завжди користуйтеся цим режимом для перетворення файлів у кодуванні \s-1UTF\-8\s0 (Unicode). +Якщо у dos2unix передбачено підтримку \s-1UTF\-16,\s0 файли у кодуванні \s-1UTF\-16\s0 буде перетворено до поточного кодування символів локалі у системах \s-1POSIX\s0 та до \s-1UTF\-8\s0 у Windows. Вмикання режиму \fBascii\fR вимикає параметр збереження кодування \s-1UTF\-16\s0 (\f(CW\*(C`\-u\*(C'\fR) і параметр, які надають змогу припускати, що вхідні дані закодовано в \s-1UTF\-16\s0 (\f(CW\*(C`\-ul\*(C'\fR і \f(CW\*(C`\-ub\*(C'\fR). Щоб визначити, чи передбачено у dos2unix підтримку \s-1UTF\-16,\s0 введіть команду \f(CW\*(C`dos2unix \-V\*(C'\fR. Див. також розділ \s-1UNICODE.\s0 .IP "\fB7bit\fR" 4 .IX Item "7bit" У цьому режимі усі 8\-бітові символи, які не є частиною \s-1ASCII,\s0 (з номерами від 128 до 255) буде перетворено на відповідні 7\-бітові символи. @@ -491,7 +513,7 @@ dos2unix \- програма для перетворення даних у те Існує декілька різних кодувань Unicode. У Unix та Linux у файлах Unicode здебільшого використовується кодування \s-1UTF\-8.\s0 У Windows для текстових файлів Unicode може бути використано кодування \s-1UTF\-8, UTF\-16\s0 або \s-1UTF\-16\s0 зі зворотним порядком байтів. Втім, здебільшого, використовується формат \s-1UTF\-16.\s0 .SS "Перетворення" .IX Subsection "Перетворення" -У текстових файлах Unicode, як і у звичайних текстових файлах, може бути використано розриви рядків \s-1DOS,\s0 Unix або Mac. +У текстових файлах Unicode, як і у текстових файлах \s-1ASCII,\s0 може бути використано розриви рядків \s-1DOS,\s0 Unix або Mac. .PP Усі версії dos2unix та unix2dos здатні виконувати перетворення у кодуванні \s-1UTF\-8,\s0 оскільки \s-1UTF\-8\s0 було розроблено так, що зворотну сумісність з \s-1ASCII\s0 збережено. .PP @@ -510,7 +532,7 @@ dos2unix \- програма для перетворення даних у те Режим перетворення \s-1ISO\s0 та 7\-бітовий режим не працюють для файлів \s-1UTF\-16.\s0 .SS "Позначка порядку байтів" .IX Subsection "Позначка порядку байтів" -У Windows до текстових файлів у кодуванні Unicode типово дописується позначка порядку байтів (\s-1BOM\s0), оскільки багато програм Windows (зокрема Notepad) додають таку позначку автоматично. Див. також . +У Windows до текстових файлів у кодуванні Unicode типово дописується позначка порядку байтів (\s-1BOM\s0), оскільки багато програм Windows (зокрема Notepad) додають таку позначку автоматично. Див. також . .PP У Unix файли у кодуванні Unicode типово не містять позначки порядку байтів. Вважається, що кодуванням текстових файлів є те кодування, яке визначається поточною локаллю. .PP @@ -555,7 +577,7 @@ Dos2unix та unix2dos завжди записують до файла резу .Ve .SH "GB18030" .IX Header "GB18030" -\&\s-1GB18030\s0 є китайським урядовим стандартом. Підтримка обов’язкової підмножини стандарту \s-1GB18030\s0 є неодмінною вимогою до будь\-яких програмних продуктів, які продаються у Китаї. Див. також . +\&\s-1GB18030\s0 є китайським урядовим стандартом. Підтримка обов’язкової підмножини стандарту \s-1GB18030\s0 є неодмінною вимогою до будь\-яких програмних продуктів, які продаються у Китаї. Див. також . .PP Кодування \s-1GB18030\s0 є повністю сумісним із Unicode. Його можна розглядати як формат перетворення unicode. Подібно до \s-1UTF\-8, GB18030\s0 є сумісним із \s-1ASCII. GB18030\s0 також є сумісним із кодовою сторінкою Windows 936, яку ще називають \s-1GBK.\s0 .PP @@ -680,12 +702,12 @@ Dos2unix та unix2dos завжди записують до файла резу \& export LANG=en_GB.UTF\-8 англійська, Великобританія, кодування UTF\-8 .Ve .Sp -Повний список мов та кодів країн наведено у підручнику з gettext: +Повний список мов та кодів країн наведено у підручнику з gettext: .Sp У системах Unix для отримання даних щодо локалі можна скористатися командою \fBlocale\fR\|(1). .IP "\fB\s-1LANGUAGE\s0\fR" 4 .IX Item "LANGUAGE" -За допомогою змінної середовища \s-1LANGUAGE\s0 ви можете вказати список пріоритеності мов. Записи у списку слід відокремлювати двокрапками. Програма dos2unix надає перевагу \s-1LANGUAGE\s0 над \s-1LANG.\s0 Наприклад, перша голландська, далі німецька: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. Спочатку вам слід увімкнути локалізацію, встановивши для змінної \s-1LANG\s0 (або \s-1LC_ALL\s0) значення, відмінне від «C». Далі ви зможете використовувати список пріоритетності мов за допомогою змінної \s-1LANGUAGE.\s0 Додаткові відомості можна знайти у підручнику з gettext: +За допомогою змінної середовища \s-1LANGUAGE\s0 ви можете вказати список пріоритетності мов. Записи у списку слід відокремлювати двокрапками. Програма dos2unix надає перевагу \s-1LANGUAGE\s0 над \s-1LANG.\s0 Наприклад, перша голландська, далі німецька: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. Спочатку вам слід увімкнути локалізацію, встановивши для змінної \s-1LANG\s0 (або \s-1LC_ALL\s0) значення, відмінне від «C». Далі ви зможете використовувати список пріоритетності мов за допомогою змінної \s-1LANGUAGE.\s0 Додаткові відомості можна знайти у підручнику з gettext: .Sp Якщо вами буде вибрано мову, перекладу якою немає, буде показано стандартні повідомлення англійською мовою. .IP "\fB\s-1DOS2UNIX_LOCALEDIR\s0\fR" 4 @@ -704,20 +726,20 @@ Dos2unix та unix2dos завжди записують до файла резу У режимі без повідомлень повернутим значенням завжди буде нуль, якщо вказано правильні параметри командного рядка. .SH "СТАНДАРТИ" .IX Header "СТАНДАРТИ" - + .PP - + .PP - + .PP - + .SH "АВТОРИ" .IX Header "АВТОРИ" Benjamin Lin \- , Bernd Johannes Wuebben (режим mac2unix) \- , Christian Wurll (додатковий новий рядок) \- , Erwin Waterlander \- (супровідник) .PP -Сторінка проекту: +Сторінка проєкту: .PP -Сторінка на SourceForge: +Сторінка на SourceForge: .SH "ТАКОЖ ПЕРЕГЛЯНЬТЕ" .IX Header "ТАКОЖ ПЕРЕГЛЯНЬТЕ" \&\fBfile\fR\|(1) \fBfind\fR\|(1) \fBiconv\fR\|(1) \fBlocale\fR\|(1) \fBxargs\fR\|(1) diff --git a/dos2unix/man/uk/man1/dos2unix.htm b/dos2unix/man/uk/man1/dos2unix.htm index 83f25f9..2341966 100644 --- a/dos2unix/man/uk/man1/dos2unix.htm +++ b/dos2unix/man/uk/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.5.1 - програма для перетворення даних у текстовому форматі DOS/Mac у формат Unix, і навпаки +dos2unix 7.5.2 - програма для перетворення даних у текстовому форматі DOS/Mac у формат Unix, і навпаки @@ -89,7 +89,7 @@

ПАРАМЕТРИ

-ascii
-

Виконати лише перетворення символів розриву рядків. Типовий режим перетворення.

+

Типовий режим перетворення. Див. також розділ щодо режимів перетворення.

-iso
@@ -246,6 +246,15 @@

ПАРАМЕТРИ

Зауважте, що іноді бінарні файли помилково розпізнаються як текстові. Див. також параметр -s.

+

Якщо використано додатковий параметр -e або --add-eol, буде також виведено дані щодо типу розриву рядків для останнього рядка або noeol, якщо такого немає.

+ +

Приклад результатів:

+ +
6       0       0  no_bom    text   dos     dos.txt
+0       6       0  no_bom    text   unix    unix.txt
+0       0       6  no_bom    text   mac     mac.txt
+1       0       0  no_bom    text   noeol   noeol_dos.txt
+

Крім того, можна вказати додаткові прапорці для внесення змін у виведені дані. Можна використовувати один або декілька таких прапорців.

@@ -285,6 +294,12 @@

ПАРАМЕТРИ

Вивести дані щодо того, є файл текстовим чи бінарним.

+ +
e
+
+ +

Вивести тип розриву рядка в останньому рядку або noeol, якщо останній рядок не містить розриву рядка.

+
c
@@ -293,6 +308,8 @@

ПАРАМЕТРИ

Із прапорцем c dos2unix виведе лише назви файлів, у яких містяться розриви рядків DOS. unix2dos виведе лише назви файлів, у яких містяться розриви рядків Unix.

+

Якщо використано додатковий параметр -e або --add-eol, буде також виведено список файлів, які не містять символу розриву рядка в останньому рядку.

+
h
@@ -330,6 +347,10 @@

ПАРАМЕТРИ

unix2dos -ic *.txt
+

Вивести список файлів, у яких є символи розриву рядків DOS або якы не містять символу розриву рядка в останньому рядку:

+ +
dos2unix -e -ic *.txt
+

Перетворити лише файли із розривами рядків DOS і не чіпати інших файлів:

dos2unix -ic0 *.txt | xargs -0 dos2unix
@@ -503,7 +524,7 @@

ПАРАМЕТРИ

РЕЖИМ MAC

-

У звичайному режимі розриви рядків DOS перетворюються на розриви рядків Unix, і навпаки. Розриви рядків Mac перетворенню не підлягають.

+

Типово, розриви рядків DOS перетворюються на розриви рядків Unix, і навпаки. Розриви рядків Mac перетворенню не підлягають.

У режимі Mac розриви рядків Mac перетворюються на розриви рядків Unix, і навпаки. Розриви рядків DOS перетворенню не підлягають.

@@ -516,9 +537,9 @@

РЕЖИМИ ПЕРA
ascii
-

У режимі ascii виконуватиметься лише перетворення символів розриву рядків. Цей режим є типовим режимом перетворення.

+

Це типовий режим перетворення. Цей режим призначено для перетворення файлів у кодуванні ASCII або сумісному з ASCII кодуванні, зокрема UTF-8. Вмикання режиму ascii вимикає режим 7bit і iso.

-

Хоча цей режим і називається режимом ASCII (стандарту 7-бітового кодування), насправді кодування символів у ньому є 8-бітовим. Завжди користуйтеся цим режимом для перетворення файлів у кодуванні UTF-8 (Unicode).

+

Якщо у dos2unix передбачено підтримку UTF-16, файли у кодуванні UTF-16 буде перетворено до поточного кодування символів локалі у системах POSIX та до UTF-8 у Windows. Вмикання режиму ascii вимикає параметр збереження кодування UTF-16 (-u) і параметр, які надають змогу припускати, що вхідні дані закодовано в UTF-16 (-ul і -ub). Щоб визначити, чи передбачено у dos2unix підтримку UTF-16, введіть команду dos2unix -V. Див. також розділ UNICODE.

7bit
@@ -583,7 +604,7 @@

Кодування

Перетворення

-

У текстових файлах Unicode, як і у звичайних текстових файлах, може бути використано розриви рядків DOS, Unix або Mac.

+

У текстових файлах Unicode, як і у текстових файлах ASCII, може бути використано розриви рядків DOS, Unix або Mac.

Усі версії dos2unix та unix2dos здатні виконувати перетворення у кодуванні UTF-8, оскільки UTF-8 було розроблено так, що зворотну сумісність з ASCII збережено.

@@ -603,7 +624,7 @@

Перетворен

Позначка порядку байтів

-

У Windows до текстових файлів у кодуванні Unicode типово дописується позначка порядку байтів (BOM), оскільки багато програм Windows (зокрема Notepad) додають таку позначку автоматично. Див. також http://en.wikipedia.org/wiki/Byte_order_mark.

+

У Windows до текстових файлів у кодуванні Unicode типово дописується позначка порядку байтів (BOM), оскільки багато програм Windows (зокрема Notepad) додають таку позначку автоматично. Див. також https://en.wikipedia.org/wiki/Byte_order_mark.

У Unix файли у кодуванні Unicode типово не містять позначки порядку байтів. Вважається, що кодуванням текстових файлів є те кодування, яке визначається поточною локаллю.

@@ -643,7 +664,7 @@

Приклади д

GB18030

-

GB18030 є китайським урядовим стандартом. Підтримка обов’язкової підмножини стандарту GB18030 є неодмінною вимогою до будь-яких програмних продуктів, які продаються у Китаї. Див. також http://en.wikipedia.org/wiki/GB_18030.

+

GB18030 є китайським урядовим стандартом. Підтримка обов’язкової підмножини стандарту GB18030 є неодмінною вимогою до будь-яких програмних продуктів, які продаються у Китаї. Див. також https://en.wikipedia.org/wiki/GB_18030.

Кодування GB18030 є повністю сумісним із Unicode. Його можна розглядати як формат перетворення unicode. Подібно до UTF-8, GB18030 є сумісним із ASCII. GB18030 також є сумісним із кодовою сторінкою Windows 936, яку ще називають GBK.

@@ -742,7 +763,7 @@

ЛОКАЛІЗАЦ@ export LANG=en_US.iso88591 англійська, США, кодування Latin-1 export LANG=en_GB.UTF-8 англійська, Великобританія, кодування UTF-8 -

Повний список мов та кодів країн наведено у підручнику з gettext: http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

+

Повний список мов та кодів країн наведено у підручнику з gettext: https://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

У системах Unix для отримання даних щодо локалі можна скористатися командою locale(1).

@@ -750,7 +771,7 @@

ЛОКАЛІЗАЦ@
LANGUAGE
-

За допомогою змінної середовища LANGUAGE ви можете вказати список пріоритеності мов. Записи у списку слід відокремлювати двокрапками. Програма dos2unix надає перевагу LANGUAGE над LANG. Наприклад, перша голландська, далі німецька: LANGUAGE=nl:de. Спочатку вам слід увімкнути локалізацію, встановивши для змінної LANG (або LC_ALL) значення, відмінне від «C». Далі ви зможете використовувати список пріоритетності мов за допомогою змінної LANGUAGE. Додаткові відомості можна знайти у підручнику з gettext: http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

+

За допомогою змінної середовища LANGUAGE ви можете вказати список пріоритетності мов. Записи у списку слід відокремлювати двокрапками. Програма dos2unix надає перевагу LANGUAGE над LANG. Наприклад, перша голландська, далі німецька: LANGUAGE=nl:de. Спочатку вам слід увімкнути локалізацію, встановивши для змінної LANG (або LC_ALL) значення, відмінне від «C». Далі ви зможете використовувати список пріоритетності мов за допомогою змінної LANGUAGE. Додаткові відомості можна знайти у підручнику з gettext: https://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

Якщо вами буде вибрано мову, перекладу якою немає, буде показано стандартні повідомлення англійською мовою.

@@ -775,21 +796,21 @@

ПОВЕРНУТЕ 

СТАНДАРТИ

-

http://en.wikipedia.org/wiki/Text_file

+

https://en.wikipedia.org/wiki/Text_file

-

http://uk.wikipedia.org/wiki/Carriage_return

+

https://uk.wikipedia.org/wiki/Carriage_return

-

http://uk.wikipedia.org/wiki/Newline

+

https://uk.wikipedia.org/wiki/Newline

-

http://uk.wikipedia.org/wiki/Unicode

+

https://uk.wikipedia.org/wiki/Unicode

АВТОРИ

Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (режим mac2unix) - <wuebben@kde.org>, Christian Wurll (додатковий новий рядок) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (супровідник)

-

Сторінка проекту: http://waterlan.home.xs4all.nl/dos2unix.html

+

Сторінка проєкту: https://waterlan.home.xs4all.nl/dos2unix.html

-

Сторінка на SourceForge: http://sourceforge.net/projects/dos2unix/

+

Сторінка на SourceForge: https://sourceforge.net/projects/dos2unix/

ТАКОЖ ПЕРЕГЛЯНЬТЕ

diff --git a/dos2unix/man/uk/man1/dos2unix.pod b/dos2unix/man/uk/man1/dos2unix.pod index e7d489d..d792107 100644 --- a/dos2unix/man/uk/man1/dos2unix.pod +++ b/dos2unix/man/uk/man1/dos2unix.pod @@ -63,7 +63,7 @@ dos2unix - програма для перетворення даних у тек =item B<-ascii> -Виконати лише перетворення символів розриву рядків. Типовий режим перетворення. +Типовий режим перетворення. Див. також розділ щодо режимів перетворення. =item B<-iso> @@ -188,6 +188,15 @@ dos2unix - програма для перетворення даних у тек Зауважте, що іноді бінарні файли помилково розпізнаються як текстові. Див. також параметр C<-s>. +Якщо використано додатковий параметр C<-e> або C<--add-eol>, буде також виведено дані щодо типу розриву рядків для останнього рядка або C, якщо такого немає. + +Приклад результатів: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Крім того, можна вказати додаткові прапорці для внесення змін у виведені дані. Можна використовувати один або декілька таких прапорців. =over 4 @@ -216,12 +225,18 @@ dos2unix - програма для перетворення даних у тек Вивести дані щодо того, є файл текстовим чи бінарним. +=item B + +Вивести тип розриву рядка в останньому рядку або C, якщо останній рядок не містить розриву рядка. + =item B Вивести дані лише тих файлів, які було б перетворено. Із прапорцем C dos2unix виведе лише назви файлів, у яких містяться розриви рядків DOS. unix2dos виведе лише назви файлів, у яких містяться розриви рядків Unix. +Якщо використано додатковий параметр C<-e> або C<--add-eol>, буде також виведено список файлів, які не містять символу розриву рядка в останньому рядку. + =item B Вивести заголовок. @@ -254,6 +269,10 @@ dos2unix - програма для перетворення даних у тек unix2dos -ic *.txt +Вивести список файлів, у яких є символи розриву рядків DOS або якы не містять символу розриву рядка в останньому рядку: + + dos2unix -e -ic *.txt + Перетворити лише файли із розривами рядків DOS і не чіпати інших файлів: dos2unix -ic0 *.txt | xargs -0 dos2unix @@ -388,7 +407,7 @@ B: перетворення на дві комбінації розр =head1 РЕЖИМ MAC -У звичайному режимі розриви рядків DOS перетворюються на розриви рядків Unix, і навпаки. Розриви рядків Mac перетворенню не підлягають. +Типово, розриви рядків DOS перетворюються на розриви рядків Unix, і навпаки. Розриви рядків Mac перетворенню не підлягають. У режимі Mac розриви рядків Mac перетворюються на розриви рядків Unix, і навпаки. Розриви рядків DOS перетворенню не підлягають. @@ -400,9 +419,9 @@ B: перетворення на дві комбінації розр =item B -У режимі C виконуватиметься лише перетворення символів розриву рядків. Цей режим є типовим режимом перетворення. +Це типовий режим перетворення. Цей режим призначено для перетворення файлів у кодуванні ASCII або сумісному з ASCII кодуванні, зокрема UTF-8. Вмикання режиму B вимикає режим B<7bit> і B. -Хоча цей режим і називається режимом ASCII (стандарту 7-бітового кодування), насправді кодування символів у ньому є 8-бітовим. Завжди користуйтеся цим режимом для перетворення файлів у кодуванні UTF-8 (Unicode). +Якщо у dos2unix передбачено підтримку UTF-16, файли у кодуванні UTF-16 буде перетворено до поточного кодування символів локалі у системах POSIX та до UTF-8 у Windows. Вмикання режиму B вимикає параметр збереження кодування UTF-16 (C<-u>) і параметр, які надають змогу припускати, що вхідні дані закодовано в UTF-16 (C<-ul> і C<-ub>). Щоб визначити, чи передбачено у dos2unix підтримку UTF-16, введіть команду C. Див. також розділ UNICODE. =item B<7bit> @@ -462,7 +481,7 @@ B: перетворення на дві комбінації розр =head2 Перетворення -У текстових файлах Unicode, як і у звичайних текстових файлах, може бути використано розриви рядків DOS, Unix або Mac. +У текстових файлах Unicode, як і у текстових файлах ASCII, може бути використано розриви рядків DOS, Unix або Mac. Усі версії dos2unix та unix2dos здатні виконувати перетворення у кодуванні UTF-8, оскільки UTF-8 було розроблено так, що зворотну сумісність з ASCII збережено. @@ -482,7 +501,7 @@ B: перетворення на дві комбінації розр =head2 Позначка порядку байтів -У Windows до текстових файлів у кодуванні Unicode типово дописується позначка порядку байтів (BOM), оскільки багато програм Windows (зокрема Notepad) додають таку позначку автоматично. Див. також L. +У Windows до текстових файлів у кодуванні Unicode типово дописується позначка порядку байтів (BOM), оскільки багато програм Windows (зокрема Notepad) додають таку позначку автоматично. Див. також L. У Unix файли у кодуванні Unicode типово не містять позначки порядку байтів. Вважається, що кодуванням текстових файлів є те кодування, яке визначається поточною локаллю. @@ -522,7 +541,7 @@ Dos2unix та unix2dos завжди записують до файла резу =head1 GB18030 -GB18030 є китайським урядовим стандартом. Підтримка обов’язкової підмножини стандарту GB18030 є неодмінною вимогою до будь-яких програмних продуктів, які продаються у Китаї. Див. також L. +GB18030 є китайським урядовим стандартом. Підтримка обов’язкової підмножини стандарту GB18030 є неодмінною вимогою до будь-яких програмних продуктів, які продаються у Китаї. Див. також L. Кодування GB18030 є повністю сумісним із Unicode. Його можна розглядати як формат перетворення unicode. Подібно до UTF-8, GB18030 є сумісним із ASCII. GB18030 також є сумісним із кодовою сторінкою Windows 936, яку ще називають GBK. @@ -622,13 +641,13 @@ GB18030 є китайським урядовим стандартом. Підт export LANG=en_US.iso88591 англійська, США, кодування Latin-1 export LANG=en_GB.UTF-8 англійська, Великобританія, кодування UTF-8 -Повний список мов та кодів країн наведено у підручнику з gettext: L +Повний список мов та кодів країн наведено у підручнику з gettext: L У системах Unix для отримання даних щодо локалі можна скористатися командою locale(1). =item B -За допомогою змінної середовища LANGUAGE ви можете вказати список пріоритеності мов. Записи у списку слід відокремлювати двокрапками. Програма dos2unix надає перевагу LANGUAGE над LANG. Наприклад, перша голландська, далі німецька: C. Спочатку вам слід увімкнути локалізацію, встановивши для змінної LANG (або LC_ALL) значення, відмінне від «C». Далі ви зможете використовувати список пріоритетності мов за допомогою змінної LANGUAGE. Додаткові відомості можна знайти у підручнику з gettext: L +За допомогою змінної середовища LANGUAGE ви можете вказати список пріоритетності мов. Записи у списку слід відокремлювати двокрапками. Програма dos2unix надає перевагу LANGUAGE над LANG. Наприклад, перша голландська, далі німецька: C. Спочатку вам слід увімкнути локалізацію, встановивши для змінної LANG (або LC_ALL) значення, відмінне від «C». Далі ви зможете використовувати список пріоритетності мов за допомогою змінної LANGUAGE. Додаткові відомості можна знайти у підручнику з gettext: L Якщо вами буде вибрано мову, перекладу якою немає, буде показано стандартні повідомлення англійською мовою. @@ -654,21 +673,21 @@ GB18030 є китайським урядовим стандартом. Підт =head1 СТАНДАРТИ -L +L -L +L -L +L -L +L =head1 АВТОРИ Benjamin Lin - , Bernd Johannes Wuebben (режим mac2unix) - , Christian Wurll (додатковий новий рядок) - , Erwin Waterlander - (супровідник) -Сторінка проекту: L +Сторінка проєкту: L -Сторінка на SourceForge: L +Сторінка на SourceForge: L =head1 ТАКОЖ ПЕРЕГЛЯНЬТЕ diff --git a/dos2unix/man/uk/man1/dos2unix.txt b/dos2unix/man/uk/man1/dos2unix.txt index c9e00aa..9ee5876 100644 --- a/dos2unix/man/uk/man1/dos2unix.txt +++ b/dos2unix/man/uk/man1/dos2unix.txt @@ -71,7 +71,7 @@ належності файлів певним користувачам і групам. -ascii - Виконати лише перетворення символів розриву рядків. Типовий режим + Типовий режим перетворення. Див. також розділ щодо режимів перетворення. -iso @@ -229,6 +229,17 @@ Зауважте, що іноді бінарні файли помилково розпізнаються як текстові. Див. також параметр "-s". + Якщо використано додатковий параметр "-e" або "--add-eol", буде + також виведено дані щодо типу розриву рядків для останнього рядка + або "noeol", якщо такого немає. + + Приклад результатів: + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + Крім того, можна вказати додаткові прапорці для внесення змін у виведені дані. Можна використовувати один або декілька таких прапорців. @@ -249,12 +260,19 @@ t Вивести дані щодо того, є файл текстовим чи бінарним. + e Вивести тип розриву рядка в останньому рядку або "noeol", якщо + останній рядок не містить розриву рядка. + c Вивести дані лише тих файлів, які було б перетворено. Із прапорцем "c" dos2unix виведе лише назви файлів, у яких містяться розриви рядків DOS. unix2dos виведе лише назви файлів, у яких містяться розриви рядків Unix. + Якщо використано додатковий параметр "-e" або "--add-eol", буде + також виведено список файлів, які не містять символу розриву + рядка в останньому рядку. + h Вивести заголовок. p Показувати назви файлів без шляхів. @@ -283,6 +301,11 @@ unix2dos -ic *.txt + Вивести список файлів, у яких є символи розриву рядків DOS або якы + не містять символу розриву рядка в останньому рядку: + + dos2unix -e -ic *.txt + Перетворити лише файли із розривами рядків DOS і не чіпати інших файлів: @@ -474,8 +497,8 @@ Вивести дані щодо версії і завершити роботу. РЕЖИМ MAC - У звичайному режимі розриви рядків DOS перетворюються на розриви рядків - Unix, і навпаки. Розриви рядків Mac перетворенню не підлягають. + Типово, розриви рядків DOS перетворюються на розриви рядків Unix, і + навпаки. Розриви рядків Mac перетворенню не підлягають. У режимі Mac розриви рядків Mac перетворюються на розриви рядків Unix, і навпаки. Розриви рядків DOS перетворенню не підлягають. @@ -486,13 +509,17 @@ РЕЖИМИ ПЕРЕТВОРЕННЯ ascii - У режимі "ascii" виконуватиметься лише перетворення символів розриву - рядків. Цей режим є типовим режимом перетворення. - - Хоча цей режим і називається режимом ASCII (стандарту 7-бітового - кодування), насправді кодування символів у ньому є 8-бітовим. Завжди - користуйтеся цим режимом для перетворення файлів у кодуванні UTF-8 - (Unicode). + Це типовий режим перетворення. Цей режим призначено для перетворення + файлів у кодуванні ASCII або сумісному з ASCII кодуванні, зокрема + UTF-8. Вмикання режиму ascii вимикає режим 7bit і iso. + + Якщо у dos2unix передбачено підтримку UTF-16, файли у кодуванні + UTF-16 буде перетворено до поточного кодування символів локалі у + системах POSIX та до UTF-8 у Windows. Вмикання режиму ascii вимикає + параметр збереження кодування UTF-16 ("-u") і параметр, які надають + змогу припускати, що вхідні дані закодовано в UTF-16 ("-ul" і + "-ub"). Щоб визначити, чи передбачено у dos2unix підтримку UTF-16, + введіть команду "dos2unix -V". Див. також розділ UNICODE. 7bit У цьому режимі усі 8-бітові символи, які не є частиною ASCII, (з @@ -575,7 +602,7 @@ UNICODE UTF-16. Перетворення - У текстових файлах Unicode, як і у звичайних текстових файлах, може бути + У текстових файлах Unicode, як і у текстових файлах ASCII, може бути використано розриви рядків DOS, Unix або Mac. Усі версії dos2unix та unix2dos здатні виконувати перетворення у @@ -616,7 +643,7 @@ UNICODE У Windows до текстових файлів у кодуванні Unicode типово дописується позначка порядку байтів (BOM), оскільки багато програм Windows (зокрема Notepad) додають таку позначку автоматично. Див. також - . + . У Unix файли у кодуванні Unicode типово не містять позначки порядку байтів. Вважається, що кодуванням текстових файлів є те кодування, яке @@ -679,7 +706,7 @@ GB18030 GB18030 є китайським урядовим стандартом. Підтримка обов’язкової підмножини стандарту GB18030 є неодмінною вимогою до будь-яких програмних продуктів, які продаються у Китаї. Див. також - . + . Кодування GB18030 є повністю сумісним із Unicode. Його можна розглядати як формат перетворення unicode. Подібно до UTF-8, GB18030 є сумісним із @@ -805,23 +832,23 @@ GB18030 export LANG=en_GB.UTF-8 англійська, Великобританія, кодування UTF-8 Повний список мов та кодів країн наведено у підручнику з gettext: - + У системах Unix для отримання даних щодо локалі можна скористатися командою locale(1). LANGUAGE За допомогою змінної середовища LANGUAGE ви можете вказати список - пріоритеності мов. Записи у списку слід відокремлювати двокрапками. + пріоритетності мов. Записи у списку слід відокремлювати двокрапками. Програма dos2unix надає перевагу LANGUAGE над LANG. Наприклад, перша голландська, далі німецька: "LANGUAGE=nl:de". Спочатку вам слід увімкнути локалізацію, встановивши для змінної LANG (або LC_ALL) значення, відмінне від «C». Далі ви зможете використовувати список пріоритетності мов за допомогою змінної LANGUAGE. Додаткові відомості можна знайти у підручнику з gettext: - + Якщо вами буде вибрано мову, перекладу якою немає, буде показано стандартні повідомлення англійською мовою. @@ -847,13 +874,13 @@ GB18030 вказано правильні параметри командного рядка. СТАНДАРТИ - + - + - + - + АВТОРИ Benjamin Lin - , Bernd Johannes Wuebben (режим @@ -861,9 +888,9 @@ GB18030 - , Erwin Waterlander - (супровідник) - Сторінка проекту: + Сторінка проєкту: - Сторінка на SourceForge: + Сторінка на SourceForge: ТАКОЖ ПЕРЕГЛЯНЬТЕ file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/dos2unix/man/zh_CN/man1/dos2unix.1 b/dos2unix/man/zh_CN/man1/dos2unix.1 index db42a66..eaa7c28 100644 --- a/dos2unix/man/zh_CN/man1/dos2unix.1 +++ b/dos2unix/man/zh_CN/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2023-08-29" "dos2unix" "2023-08-29" +.TH dos2unix 1 "2024-01-22" "dos2unix" "2024-01-22" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -122,7 +122,7 @@ Dos2unix由SunOS/Solaris下的版本改写而成。这两个版本间有一个 若使用此选项，将允许在转换文件时原始文件的属主或属组发生变更，类似于使用新文件模式进行转换。另请参见选项\f(CW\*(C`\-o\*(C'\fR 和 \f(CW\*(C`\-n\*(C'\fR。仅当 dos2unix 支持保护文件的属主/属组时才能使用该选项。 .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" -只转换断行符。这是默认的转换模式。 +默认转换模式。。参见 \s-1CONVERSION MODES\s0 一节。 .IP "\fB\-iso\fR" 4 .IX Item "-iso" 在DOS和ISO\-8859\-1字符集之间转换。参见 \s-1CONVERSION MODES\s0 一节。 @@ -226,6 +226,17 @@ utf8的优点在于它与ASCII兼容。你需要设置终端的字体为TrueType .Sp 注意，二进制文件有时会被误判为文本文件。参见选项 \f(CW\*(C`\-s\*(C'\fR。 .Sp +如果额外使用了 \f(CW\*(C`\-e\*(C'\fR 或 \f(CW\*(C`\-\-add\-eol\*(C'\fR 选项，则最后一行的断行符类型也会被显示，或者在缺失的情况下显示 \f(CW\*(C`noeol\*(C'\fR。 +.Sp +输出示例： +.Sp +.Vb 4 +\& 6 0 0 no_bom text dos dos.txt +\& 0 6 0 no_bom text unix unix.txt +\& 0 0 6 no_bom text mac mac.txt +\& 1 0 0 no_bom text noeol noeol_dos.txt +.Ve +.Sp 可以为输出设置额外的标志（一个或多个）。 .RS 4 .IP "\fB0\fR" 4 @@ -246,11 +257,16 @@ utf8的优点在于它与ASCII兼容。你需要设置终端的字体为TrueType .IP "\fBt\fR" 4 .IX Item "t" 显示文件为文本或二进制。 +.IP "\fBe\fR" 4 +.IX Item "e" +显示最后一行的断行符类型，如果不存在则显示 \f(CW\*(C`noeol\*(C'\fR。 .IP "\fBc\fR" 4 .IX Item "c" 只显示将会被转换的文件。 .Sp 若设置了 \f(CW\*(C`c\*(C'\fR标志，dos2unix将只显示含有DOS断行符的文件，unix2dos将只显示含有Unix断行符的文件。 +.Sp +如果额外使用了 \f(CW\*(C`\-e\*(C'\fR 或 \f(CW\*(C`\-\-add\-eol\*(C'\fR 选项，则最后一行缺失断行符的文件将被显示。 .IP "\fBh\fR" 4 .IX Item "h" 显示头部。 @@ -292,6 +308,12 @@ utf8的优点在于它与ASCII兼容。你需要设置终端的字体为TrueType \& unix2dos \-ic *.txt .Ve .Sp +列出含有DOS断行符或最后一行缺少断行符的文件： +.Sp +.Vb 1 +\& dos2unix \-e \-ic *.txt +.Ve +.Sp 只转换含有DOS断行符的文件，保持其他文件不变： .Sp .Vb 1 @@ -412,7 +434,7 @@ dos2unix 在转换格式时会生成一个临时文件。如果在转换时出 显示版本信息，然后退出。 .SH "Mac模式" .IX Header "Mac模式" -普通模式下，断行符将被转换为DOS格式，或相反。Mac格式的断行符将不会被转换。 +默认情况下断行符将从DOS格式转换为Unix格式，或相反。Mac格式的断行符将不会被转换。 .PP Mac模式下，Mac断行符将被转换为Unix格式，或相反。DOS断行符将不会被转换。 .PP @@ -421,9 +443,9 @@ Mac模式下，Mac断行符将被转换为Unix格式，或相反。DOS断行符 .IX Header "转换模式" .IP "\fBascii\fR" 4 .IX Item "ascii" -在 \f(CW\*(C`ascii\*(C'\fR 模式下，只转换断行符。 这是默认的转换模式。 +这是默认转换模式。该模式用于转换ASCII和ASCII兼容编码的文件，例如UTF\-8。启用\fBascii\fR模式会禁用\fB7bit\fR和\fBiso\fR模式。 .Sp -尽管此模式名叫“ASCII”（7位编码标准），实际上转换按照8位编码进行。转换UTF\-8编码文件时请务必使用此模式。 +如果dos2unix带有UTF\-16支持，则UTF\-16编码的文件在POSIX系统上将被转换为当前语区对应的字符编码，在Windows上则会被转换为UTF\-8。启用 \fBascii\fR 模式将禁用维持UTF\-16编码的选项（\f(CW\*(C`\-u\*(C'\fR）和假定输入为UTF\-16的选项（\f(CW\*(C`\-ul\*(C'\fR 和 \f(CW\*(C`\-ub\*(C'\fR）。如需查看dos2unix是否带有UTF\-16支持，请运行 \f(CW\*(C`dos2unix \-V\*(C'\fR。更多信息另请参见 \s-1UNICODE\s0 章节。 .IP "\fB7bit\fR" 4 .IX Item "7bit" 在此模式下，所以的8位非ASCII字符（取值范围128\-255）将被转换到7位编码空间。 @@ -493,7 +515,7 @@ Unix下，将在DOS字符集（编码页）和ISO字符集 ISO\-8859\-1（Latin\ 有几种不同的Unicode编码。对于Unix和Linux中的Unicode文件，通常为UTF\-8编码。Windows中的文本文件可以是UTF\-8、UTF\-16或UTF\-16BE编码，但大多采用UTF\-16格式。 .SS "转换" .IX Subsection "转换" -Unicode文本文件可以含有DOS、Unix或Mac断行符，就像普通文本文件一样。 +Unicode文本文件可以含有DOS、Unix或Mac断行符，就像ASCII文本文件一样。 .PP 所有版本的dos2unix和unix2dos都可以转换UTF\-8文件，因为UTF\-8向后兼容ASCII。 .PP @@ -512,7 +534,7 @@ dos2unix和unix2dos没有用于转换UTF\-8到UTF\-16的选项。 ISO和7位编码模式的转换无法用于UTF\-16文件。 .SS "字节序标记" .IX Subsection "字节序标记" -在Windows中，文本文件一般含有字节序标记（BOM），因为很多Windows程序（包括记事本）默认添加BOM。参见 。 +在Windows中，文本文件一般含有字节序标记（BOM），因为很多Windows程序（包括记事本）默认添加BOM。参见 。 .PP 在Unix中，Unicode文件一般不含BOM。假定文本文件使用区域字符编码设置所指定的编码。 .PP @@ -557,7 +579,7 @@ dos2unix对于Windows命令提示符中读取和写入Unicode文件名有额外 .Ve .SH "GB18030" .IX Header "GB18030" -GB18030是中国国家标准。GB18030标准的一系列子集被强制应用于中国销售的软件产品。参见 。 +GB18030是中国国家标准。GB18030标准的一系列子集被强制应用于中国销售的软件产品。参见 。 .PP GB18030与Unicode完全兼容，并且可以被认为是Unicode格式的变体。和UTF\-8一样，GB18030也兼容ASCII。GB18030也兼容Windows 936代码页（GBK）。 .PP @@ -683,12 +705,12 @@ LANG环境变量指定了程序所使用的首选语言。它包括几个部分 \& export LANG=en_GB.UTF\-8 英语，英国，UTF\-8编码 .Ve .Sp -完整的语言和国家/地区编码可以在gettext手册中找到： +完整的语言和国家/地区编码可以在gettext手册中找到： .Sp 在Unix系统中，你可以使用 \fBlocale\fR\|(1) 命令获取特定区域的信息。 .IP "\fB\s-1LANGUAGE\s0\fR" 4 .IX Item "LANGUAGE" -可以使用LANGUAGE变量指定一系列语言的优先级，各项之间由冒号分割。dos2unix首先使用LANGUAGE变量，其次才是LANG。例如，首选中文、其次英文：\f(CW\*(C`LANGUAGE= +可以使用LANGUAGE变量指定一系列语言的优先级，各项之间由冒号分割。dos2unix首先使用LANGUAGE变量，其次才是LANG。例如，首选中文、其次英文：\f(CW\*(C`LANGUAGE= .Sp 如果你选择了一个不可用的语言，程序将会输出标准的英语信息。 .IP "\fB\s-1DOS2UNIX_LOCALEDIR\s0\fR" 4 @@ -707,20 +729,20 @@ DOS2UNIX_LOCALEDIR环境变量将覆盖编译时设置的LOCALEDIR变量。LOCAL 在安静模式下，返回值总是为0，除非命令行选项有误。 .SH "遵循规范" .IX Header "遵循规范" - + .PP - + .PP - + .PP - + .SH "作者" .IX Header "作者" Benjamin Lin \- Bernd Johannes Wuebben（mac2unix模式） \- ，Christian Wurll（添加额外新行） \- ，Erwin Waterlander \- （维护者） .PP -项目主页： +项目主页： .PP -SourceForge主页： +SourceForge主页： .SH "参见" .IX Header "参见" \&\fBfile\fR\|(1) \fBfind\fR\|(1) \fBiconv\fR\|(1) \fBlocale\fR\|(1) \fBxargs\fR\|(1) diff --git a/dos2unix/man/zh_CN/man1/dos2unix.htm b/dos2unix/man/zh_CN/man1/dos2unix.htm index 1011f10..c7d304d 100644 --- a/dos2unix/man/zh_CN/man1/dos2unix.htm +++ b/dos2unix/man/zh_CN/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.5.1 - DOS/Mac - Unix文件格式转换器 +dos2unix 7.5.2 - DOS/Mac - Unix文件格式转换器 @@ -89,7 +89,7 @@

选项

-ascii
-

只转换断行符。这是默认的转换模式。

+

默认转换模式。。参见 CONVERSION MODES 一节。

-iso
@@ -246,6 +246,15 @@

选项

注意，二进制文件有时会被误判为文本文件。参见选项 -s。

+

如果额外使用了 -e 或 --add-eol 选项，则最后一行的断行符类型也会被显示，或者在缺失的情况下显示 noeol。

+ +

输出示例：

+ +
6       0       0  no_bom    text   dos     dos.txt
+0       6       0  no_bom    text   unix    unix.txt
+0       0       6  no_bom    text   mac     mac.txt
+1       0       0  no_bom    text   noeol   noeol_dos.txt
+

可以为输出设置额外的标志（一个或多个）。

@@ -285,6 +294,12 @@

选项

显示文件为文本或二进制。

+
+
e
+
+ +

显示最后一行的断行符类型，如果不存在则显示 noeol。

+
c
@@ -293,6 +308,8 @@

选项

若设置了 c标志，dos2unix将只显示含有DOS断行符的文件，unix2dos将只显示含有Unix断行符的文件。

+

如果额外使用了 -e 或 --add-eol 选项，则最后一行缺失断行符的文件将被显示。

+
h
@@ -330,6 +347,10 @@

选项

unix2dos -ic *.txt
+

列出含有DOS断行符或最后一行缺少断行符的文件：

+ +
dos2unix -e -ic *.txt
+

只转换含有DOS断行符的文件，保持其他文件不变：

dos2unix -ic0 *.txt | xargs -0 dos2unix
@@ -503,7 +524,7 @@

选项

Mac模式

-

普通模式下，断行符将被转换为DOS格式，或相反。Mac格式的断行符将不会被转换。

+

默认情况下断行符将从DOS格式转换为Unix格式，或相反。Mac格式的断行符将不会被转换。

Mac模式下，Mac断行符将被转换为Unix格式，或相反。DOS断行符将不会被转换。

@@ -516,9 +537,9 @@

转换模式

ascii
-

在 ascii 模式下，只转换断行符。 这是默认的转换模式。

+

这是默认转换模式。该模式用于转换ASCII和ASCII兼容编码的文件，例如UTF-8。启用ascii模式会禁用7bit和iso模式。

-

尽管此模式名叫“ASCII”（7位编码标准），实际上转换按照8位编码进行。转换UTF-8编码文件时请务必使用此模式。

+

如果dos2unix带有UTF-16支持，则UTF-16编码的文件在POSIX系统上将被转换为当前语区对应的字符编码，在Windows上则会被转换为UTF-8。启用 ascii 模式将禁用维持UTF-16编码的选项（-u）和假定输入为UTF-16的选项（-ul 和 -ub）。如需查看dos2unix是否带有UTF-16支持，请运行 dos2unix -V。更多信息另请参见 UNICODE 章节。

7bit
@@ -583,7 +604,7 @@

编码

转换

-

Unicode文本文件可以含有DOS、Unix或Mac断行符，就像普通文本文件一样。

+

Unicode文本文件可以含有DOS、Unix或Mac断行符，就像ASCII文本文件一样。

所有版本的dos2unix和unix2dos都可以转换UTF-8文件，因为UTF-8向后兼容ASCII。

@@ -603,7 +624,7 @@

转换

字节序标记

-

在Windows中，文本文件一般含有字节序标记（BOM），因为很多Windows程序（包括记事本）默认添加BOM。参见 http://en.wikipedia.org/wiki/Byte_order_mark。

+

在Windows中，文本文件一般含有字节序标记（BOM），因为很多Windows程序（包括记事本）默认添加BOM。参见 https://en.wikipedia.org/wiki/Byte_order_mark。

在Unix中，Unicode文件一般不含BOM。假定文本文件使用区域字符编码设置所指定的编码。

@@ -643,7 +664,7 @@

Unicode示例

GB18030

-

GB18030是中国国家标准。GB18030标准的一系列子集被强制应用于中国销售的软件产品。参见 http://en.wikipedia.org/wiki/GB_18030。

+

GB18030是中国国家标准。GB18030标准的一系列子集被强制应用于中国销售的软件产品。参见 https://en.wikipedia.org/wiki/GB_18030。

GB18030与Unicode完全兼容，并且可以被认为是Unicode格式的变体。和UTF-8一样，GB18030也兼容ASCII。GB18030也兼容Windows 936代码页（GBK）。

@@ -743,7 +764,7 @@

区域

export LANG=en_US.iso88591 英语，美国，Latin-1编码 export LANG=en_GB.UTF-8 英语，英国，UTF-8编码 -

完整的语言和国家/地区编码可以在gettext手册中找到：http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

+

完整的语言和国家/地区编码可以在gettext手册中找到：https://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html

在Unix系统中，你可以使用 locale(1) 命令获取特定区域的信息。

@@ -751,7 +772,7 @@

区域

LANGUAGE
-

可以使用LANGUAGE变量指定一系列语言的优先级，各项之间由冒号分割。dos2unix首先使用LANGUAGE变量，其次才是LANG。例如，首选中文、其次英文：LANGUAGE=<zh:en。在使用语言优先级之前，必须先启用区域化功能，即将LANG（或LC_ALL）变量设置为除了“C”以外的其他值。参见gettext手册：http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

+

可以使用LANGUAGE变量指定一系列语言的优先级，各项之间由冒号分割。dos2unix首先使用LANGUAGE变量，其次才是LANG。例如，首选中文、其次英文：LANGUAGE=<zh:en。在使用语言优先级之前，必须先启用区域化功能，即将LANG（或LC_ALL）变量设置为除了“C”以外的其他值。参见gettext手册：https://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html

如果你选择了一个不可用的语言，程序将会输出标准的英语信息。

@@ -776,21 +797,21 @@

返回值

遵循规范

-

http://en.wikipedia.org/wiki/Text_file

+

https://en.wikipedia.org/wiki/Text_file

-

http://en.wikipedia.org/wiki/Carriage_return

+

https://en.wikipedia.org/wiki/Carriage_return

-

http://en.wikipedia.org/wiki/Newline

+

https://en.wikipedia.org/wiki/Newline

-

http://en.wikipedia.org/wiki/Unicode

+

https://en.wikipedia.org/wiki/Unicode

作者

Benjamin Lin - <blin@socs.uts.edu.au> Bernd Johannes Wuebben（mac2unix模式） - <wuebben@kde.org>，Christian Wurll（添加额外新行） - <wurll@ira.uka.de>，Erwin Waterlander - <waterlan@xs4all.nl>（维护者）

-

项目主页：http://waterlan.home.xs4all.nl/dos2unix.html

+

项目主页：https://waterlan.home.xs4all.nl/dos2unix.html

-

SourceForge主页：http://sourceforge.net/projects/dos2unix/

+

SourceForge主页：https://sourceforge.net/projects/dos2unix/

参见

diff --git a/dos2unix/man/zh_CN/man1/dos2unix.pod b/dos2unix/man/zh_CN/man1/dos2unix.pod index a87fb02..e4c5d6d 100644 --- a/dos2unix/man/zh_CN/man1/dos2unix.pod +++ b/dos2unix/man/zh_CN/man1/dos2unix.pod @@ -63,7 +63,7 @@ Dos2unix由SunOS/Solaris下的版本改写而成。这两个版本间有一个 =item B<-ascii> -只转换断行符。这是默认的转换模式。 +默认转换模式。。参见 CONVERSION MODES 一节。 =item B<-iso> @@ -188,6 +188,15 @@ utf8的优点在于它与ASCII兼容。你需要设置终端的字体为TrueType 注意，二进制文件有时会被误判为文本文件。参见选项 C<-s>。 +如果额外使用了 C<-e> 或 C<--add-eol> 选项，则最后一行的断行符类型也会被显示，或者在缺失的情况下显示 C。 + +输出示例： + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + 可以为输出设置额外的标志（一个或多个）。 =over 4 @@ -216,12 +225,18 @@ utf8的优点在于它与ASCII兼容。你需要设置终端的字体为TrueType 显示文件为文本或二进制。 +=item B + +显示最后一行的断行符类型，如果不存在则显示 C。 + =item B 只显示将会被转换的文件。 若设置了 C标志，dos2unix将只显示含有DOS断行符的文件，unix2dos将只显示含有Unix断行符的文件。 +如果额外使用了 C<-e> 或 C<--add-eol> 选项，则最后一行缺失断行符的文件将被显示。 + =item B 显示头部。 @@ -254,6 +269,10 @@ utf8的优点在于它与ASCII兼容。你需要设置终端的字体为TrueType unix2dos -ic *.txt +列出含有DOS断行符或最后一行缺少断行符的文件： + + dos2unix -e -ic *.txt + 只转换含有DOS断行符的文件，保持其他文件不变： dos2unix -ic0 *.txt | xargs -0 dos2unix @@ -388,7 +407,7 @@ dos2unix 在转换格式时会生成一个临时文件。如果在转换时出 =head1 Mac模式 -普通模式下，断行符将被转换为DOS格式，或相反。Mac格式的断行符将不会被转换。 +默认情况下断行符将从DOS格式转换为Unix格式，或相反。Mac格式的断行符将不会被转换。 Mac模式下，Mac断行符将被转换为Unix格式，或相反。DOS断行符将不会被转换。 @@ -400,9 +419,9 @@ Mac模式下，Mac断行符将被转换为Unix格式，或相反。DOS断行符 =item B -在 C 模式下，只转换断行符。 这是默认的转换模式。 +这是默认转换模式。该模式用于转换ASCII和ASCII兼容编码的文件，例如UTF-8。启用B模式会禁用B<7bit>和B模式。 -尽管此模式名叫“ASCII”（7位编码标准），实际上转换按照8位编码进行。转换UTF-8编码文件时请务必使用此模式。 +如果dos2unix带有UTF-16支持，则UTF-16编码的文件在POSIX系统上将被转换为当前语区对应的字符编码，在Windows上则会被转换为UTF-8。启用 B 模式将禁用维持UTF-16编码的选项（C<-u>）和假定输入为UTF-16的选项（C<-ul> 和 C<-ub>）。如需查看dos2unix是否带有UTF-16支持，请运行 C。更多信息另请参见 UNICODE 章节。 =item B<7bit> @@ -462,7 +481,7 @@ Unix下，将在DOS字符集（编码页）和ISO字符集 ISO-8859-1（Latin-1 =head2 转换 -Unicode文本文件可以含有DOS、Unix或Mac断行符，就像普通文本文件一样。 +Unicode文本文件可以含有DOS、Unix或Mac断行符，就像ASCII文本文件一样。 所有版本的dos2unix和unix2dos都可以转换UTF-8文件，因为UTF-8向后兼容ASCII。 @@ -482,7 +501,7 @@ ISO和7位编码模式的转换无法用于UTF-16文件。 =head2 字节序标记 -在Windows中，文本文件一般含有字节序标记（BOM），因为很多Windows程序（包括记事本）默认添加BOM。参见 L。 +在Windows中，文本文件一般含有字节序标记（BOM），因为很多Windows程序（包括记事本）默认添加BOM。参见 L。 在Unix中，Unicode文件一般不含BOM。假定文本文件使用区域字符编码设置所指定的编码。 @@ -522,7 +541,7 @@ dos2unix对于Windows命令提示符中读取和写入Unicode文件名有额外 =head1 GB18030 -GB18030是中国国家标准。GB18030标准的一系列子集被强制应用于中国销售的软件产品。参见 L。 +GB18030是中国国家标准。GB18030标准的一系列子集被强制应用于中国销售的软件产品。参见 L。 GB18030与Unicode完全兼容，并且可以被认为是Unicode格式的变体。和UTF-8一样，GB18030也兼容ASCII。GB18030也兼容Windows 936代码页（GBK）。 @@ -623,13 +642,13 @@ LANG环境变量指定了程序所使用的首选语言。它包括几个部分 export LANG=en_US.iso88591 英语，美国，Latin-1编码 export LANG=en_GB.UTF-8 英语，英国，UTF-8编码 -完整的语言和国家/地区编码可以在gettext手册中找到：L +完整的语言和国家/地区编码可以在gettext手册中找到：L 在Unix系统中，你可以使用 locale(1) 命令获取特定区域的信息。 =item B -可以使用LANGUAGE变量指定一系列语言的优先级，各项之间由冒号分割。dos2unix首先使用LANGUAGE变量，其次才是LANG。例如，首选中文、其次英文：C。在使用语言优先级之前，必须先启用区域化功能，即将LANG（或LC_ALL）变量设置为除了“C”以外的其他值。参见gettext手册：L +可以使用LANGUAGE变量指定一系列语言的优先级，各项之间由冒号分割。dos2unix首先使用LANGUAGE变量，其次才是LANG。例如，首选中文、其次英文：C。在使用语言优先级之前，必须先启用区域化功能，即将LANG（或LC_ALL）变量设置为除了“C”以外的其他值。参见gettext手册：L 如果你选择了一个不可用的语言，程序将会输出标准的英语信息。 @@ -655,21 +674,21 @@ DOS2UNIX_LOCALEDIR环境变量将覆盖编译时设置的LOCALEDIR变量。LOCAL =head1 遵循规范 -L +L -L +L -L +L -L +L =head1 作者 Benjamin Lin - Bernd Johannes Wuebben（mac2unix模式） - ，Christian Wurll（添加额外新行） - ，Erwin Waterlander - （维护者） -项目主页：L +项目主页：L -SourceForge主页：L +SourceForge主页：L =head1 参见 diff --git a/dos2unix/man/zh_CN/man1/dos2unix.txt b/dos2unix/man/zh_CN/man1/dos2unix.txt index 5a82d00..75a556a 100644 --- a/dos2unix/man/zh_CN/man1/dos2unix.txt +++ b/dos2unix/man/zh_CN/man1/dos2unix.txt @@ -41,7 +41,7 @@ dos2unix 支持保护文件的属主/属组时才能使用该选项。 -ascii - 只转换断行符。这是默认的转换模式。 + 默认转换模式。。参见 CONVERSION MODES 一节。 -iso 在DOS和ISO-8859-1字符集之间转换。参见 CONVERSION MODES 一节。 @@ -152,6 +152,15 @@ 注意，二进制文件有时会被误判为文本文件。参见选项 "-s"。 + 如果额外使用了 "-e" 或 "--add-eol" 选项，则最后一行的断行符类型也会被显示，或者在缺失的情况下显示 "noeol"。 + + 输出示例： + + 6 0 0 no_bom text dos dos.txt + 0 6 0 no_bom text unix unix.txt + 0 0 6 no_bom text mac mac.txt + 1 0 0 no_bom text noeol noeol_dos.txt + 可以为输出设置额外的标志（一个或多个）。 0 使用零字符（"\0"）而非换行符来分割文件信息行。用于在指定了 c 选项的情况下，正确解析含有空格或引号的文件名。请结合 @@ -167,10 +176,14 @@ t 显示文件为文本或二进制。 + e 显示最后一行的断行符类型，如果不存在则显示 "noeol"。 + c 只显示将会被转换的文件。 若设置了 "c"标志，dos2unix将只显示含有DOS断行符的文件，unix2dos将只显示含有Unix断行符的文件。 + 如果额外使用了 "-e" 或 "--add-eol" 选项，则最后一行缺失断行符的文件将被显示。 + h 显示头部。 p 显示不含路径的文件名。 @@ -197,6 +210,10 @@ unix2dos -ic *.txt + 列出含有DOS断行符或最后一行缺少断行符的文件： + + dos2unix -e -ic *.txt + 只转换含有DOS断行符的文件，保持其他文件不变： dos2unix -ic0 *.txt | xargs -0 dos2unix @@ -318,7 +335,7 @@ 显示版本信息，然后退出。 Mac模式 - 普通模式下，断行符将被转换为DOS格式，或相反。Mac格式的断行符将不会被转换。 + 默认情况下断行符将从DOS格式转换为Unix格式，或相反。Mac格式的断行符将不会被转换。 Mac模式下，Mac断行符将被转换为Unix格式，或相反。DOS断行符将不会被转换。 @@ -326,9 +343,12 @@ Mac模式 转换模式 ascii - 在 "ascii" 模式下，只转换断行符。 这是默认的转换模式。 + 这是默认转换模式。该模式用于转换ASCII和ASCII兼容编码的文件，例如UTF-8。启用ascii模式会禁用7bit和iso模式。 - 尽管此模式名叫“ASCII”（7位编码标准），实际上转换按照8位编码进行。转换UTF-8编码文件时请务必使用此模式。 + 如果dos2unix带有UTF-16支持，则UTF-16编码的文件在POSIX系统上将被转换为当前语区对应的字符编码，在Windows上 + 则会被转换为UTF-8。启用 ascii 模式将禁用维持UTF-16编码的选项（"-u"）和假定输入为UTF-16的选项（"-ul" 和 + "-ub"）。如需查看dos2unix是否带有UTF-16支持，请运行 "dos2unix -V"。更多信息另请参见 UNICODE + 章节。 7bit 在此模式下，所以的8位非ASCII字符（取值范围128-255）将被转换到7位编码空间。 @@ -387,7 +407,7 @@ UNICODE 、UTF-16或UTF-16BE编码，但大多采用UTF-16格式。 转换 - Unicode文本文件可以含有DOS、Unix或Mac断行符，就像普通文本文件一样。 + Unicode文本文件可以含有DOS、Unix或Mac断行符，就像ASCII文本文件一样。 所有版本的dos2unix和unix2dos都可以转换UTF-8文件，因为UTF-8向后兼容ASCII。 @@ -409,7 +429,7 @@ UNICODE 字节序标记 在Windows中，文本文件一般含有字节序标记（BOM），因为很多Windows程序（包括记事本）默认添加BOM。参见 - 。 + 。 在Unix中，Unicode文件一般不含BOM。假定文本文件使用区域字符编码设置所指定的编码。 @@ -449,7 +469,7 @@ UNICODE GB18030 GB18030是中国国家标准。GB18030标准的一系列子集被强制应用于中国销售的软件产品。参见 - 。 + 。 GB18030与Unicode完全兼容，并且可以被认为是Unicode格式的变体。和UTF-8一样，GB18030也兼容ASCII。GB1803 0也兼容Windows 936代码页（GBK）。 @@ -547,16 +567,16 @@ GB18030 export LANG=en_US.iso88591 英语，美国，Latin-1编码 export LANG=en_GB.UTF-8 英语，英国，UTF-8编码 - 完整的语言和国家/地区编码可以在gettext手册中找到： + 完整的语言和国家/地区编码可以在gettext手册中找到： 在Unix系统中，你可以使用 locale(1) 命令获取特定区域的信息。 LANGUAGE 可以使用LANGUAGE变量指定一系列语言的优先级，各项之间由冒号分割。dos2unix首先使用LANGUAGE变量，其次才是LANG。 例如，首选中文、其次英文："LANGUAGE= + 变量设置为除了“C”以外的其他值。参见gettext手册： 如果你选择了一个不可用的语言，程序将会输出标准的英语信息。 @@ -574,22 +594,22 @@ GB18030 在安静模式下，返回值总是为0，除非命令行选项有误。 遵循规范 - + - + - + - + 作者 Benjamin Lin - Bernd Johannes Wuebben（mac2unix模式） - ，Christian Wurll（添加额外新行） - ，Erwin Waterlander - （维护者） - 项目主页： + 项目主页： - SourceForge主页： + SourceForge主页： 参见 file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/dos2unix/po-man/de.po b/dos2unix/po-man/de.po index 13b3288..77ed102 100644 --- a/dos2unix/po-man/de.po +++ b/dos2unix/po-man/de.po @@ -1,13 +1,13 @@ # German translation of the dos2unix man page. # Copyright (C) 2014 Erwin Waterlander (msgids) # This file is distributed under the same license as the dos2unix package. -# Mario Blättermann , 2014-2017, 2022. +# Mario Blättermann , 2014-2017, 2022-2023. # Roland Illig , 2020. msgid "" msgstr "" -"Project-Id-Version: dos2unix-man-7.4.4-beta4\n" -"POT-Creation-Date: 2023-04-20 22:31+0200\n" -"PO-Revision-Date: 2022-12-19 13:08+0100\n" +"Project-Id-Version: dos2unix-man-7.5.2-beta3\n" +"POT-Creation-Date: 2023-11-27 22:01+0100\n" +"PO-Revision-Date: 2023-11-29 17:22+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" "Language: de\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Lokalize 22.08.3\n" +"X-Generator: Lokalize 23.08.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: =head1 @@ -147,8 +147,8 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:121 -msgid "Convert only line breaks. This is the default conversion mode." -msgstr "wandelt nur Zeilenumbrüche um. Dies ist der vorgegebene Umwandlungsmodus." +msgid "Default conversion mode. See also section CONVERSION MODES." +msgstr "ist der voreingestellte Umwandlungsmodus. Weitere Informationen hierzu finden Sie im Abschnitt UMWANDLUNGSMODI." #. type: =item #: dos2unix.pod:123 @@ -342,20 +342,18 @@ msgstr "Die Standardkodierung kann durch Setzen der Umgebungsvariable DOS2UNIX_D #. type: =item #: dos2unix.pod:240 -#, fuzzy -#| msgid "B<-m, --add-bom>" msgid "B<-e, --add-eol>" -msgstr "B<-m, --add-bom>" +msgstr "B<-e, --add-eol>" #. type: textblock #: dos2unix.pod:242 msgid "Add a line break to the last line if there isn't one. This works for every conversion." -msgstr "" +msgstr "fügt einen Zeilenumbruch nach der letzten Zeile hinzu, falls ein solcher nicht existiert. Dies funktioniert in jeder Umwandlung." #. type: textblock #: dos2unix.pod:245 msgid "A file converted from DOS to Unix format may lack a line break on the last line. There are text editors that write text files without a line break on the last line. Some Unix programs have problems processing these files, because the POSIX standard defines that every line in a text file must end with a terminating newline character. For instance concatenating files may not give the expected result." -msgstr "" +msgstr "Einer Datei, die aus dem DOS- ins Unix-Format umgewandelt wurde, kann ein Zeilenumbruch nach der letzten Zeile fehlen. Es gibt Texteditoren, die Dateien ohne diesen angehängten Zeilenumbruch schreiben. Einige Unix-Programme haben jedoch Probleme mit der Verarbeitung dieser Dateien, da der POSIX-Standard definiert, dass jede Zeile in einer Textdatei mit einem abschließenden Zeilenvorschubzeichen enden muss. Beispielsweise kann es beim Aneinanderhängen von solche Dateien zu unerwarteten Ergebnissen kommen." #. type: =item #: dos2unix.pod:252 @@ -403,7 +401,7 @@ msgid "The following information is printed, in this order: number of DOS line b msgstr "Die Ausgabe der Informationen geschieht in der folgenden Reihenfolge: Anzahl der DOS-Zeilenumbrüche, Anzahl der Unix-Zeilenumbrüche, Anzahl der Mac-Zeilenumbrüche, Markierung der Bytereihenfolge, Text- oder Binärformat, Dateiname." #. type: textblock -#: dos2unix.pod:274 +#: dos2unix.pod:274 dos2unix.pod:290 msgid "Example output:" msgstr "Beispielausgabe:" @@ -438,116 +436,152 @@ msgstr "Beachten sie, dass manchmal eine Binärdatei fälschlicherweise als Text #. type: textblock #: dos2unix.pod:287 +msgid "If in addition option C<-e> or C<--add-eol> is used also the type of the line break of the last line is printed, or C if there is none." +msgstr "Wenn zusätzlich die Option C<-e> oder C<--add-eol> verwendet wird, dann wird auch der Typ des Zeilenumbruchs der letzten Zeile ausgegeben, oder C, falls kein solcher Zeilenumbruch existiert." + +#. type: verbatim +#: dos2unix.pod:292 +#, no-wrap +msgid "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" +msgstr "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:297 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Optionale zusätzliche Schalter können gesetzt werden, um die Ausgabe anzupassen. Einer oder mehrere Schalter können hinzugefügt werden." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:302 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:304 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "gibt die Zeilen zur Dateiinformation mit einem Null-Zeichen am Ende anstelle eines Zeilenvorschub-Zeichens aus. Dies ermöglicht die korrekte Interpretation von Leer- und Anführungszeichen in Dateinamen, wenn der Schalter c verwendet wird. Verwenden Sie diesen Schalter in Kombination mit der xargs(1)-Option C<-0> oder C<--null>." #. type: =item -#: dos2unix.pod:299 +#: dos2unix.pod:309 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:301 +#: dos2unix.pod:311 msgid "Print number of DOS line breaks." msgstr "gibt die Anzahl der DOS-Zeilenumbrüche aus." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:313 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:315 msgid "Print number of Unix line breaks." msgstr "gibt die Anzahl der Unix-Zeilenumbrüche aus." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:317 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:319 msgid "Print number of Mac line breaks." msgstr "gibt die Anzahl der Mac-Zeilenumbrüche aus." #. type: =item -#: dos2unix.pod:311 +#: dos2unix.pod:321 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:323 msgid "Print the byte order mark." msgstr "gibt die Markierung der Bytereihenfolge aus." #. type: =item -#: dos2unix.pod:315 +#: dos2unix.pod:325 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:317 +#: dos2unix.pod:327 msgid "Print if file is text or binary." msgstr "zeigt an, ob es sich um eine Text- oder eine Binärdatei handelt." #. type: =item -#: dos2unix.pod:319 +#: dos2unix.pod:329 +msgid "B" +msgstr "B" + +#. type: textblock +#: dos2unix.pod:331 +msgid "Print the type of the line break of the last line, or C if there is none." +msgstr "gibt den Typ des Zeilenumbruchs der letzten Zeile aus, oder C, falls kein solcher Zeilenumbruch existiert." + +#. type: =item +#: dos2unix.pod:333 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:321 +#: dos2unix.pod:335 msgid "Print only the files that would be converted." msgstr "gibt nur die Dateien aus, die umgewandelt werden würden." #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:337 msgid "With the C flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Mit dem Schalter C gibt dos2unix nur die Dateien aus, die DOS-Zeilenumbrüche enthalten, unix2dos nur die Dateien mit Unix-Zeilenumbrüchen." +#. type: textblock +#: dos2unix.pod:340 +msgid "If in addition option C<-e> or C<--add-eol> is used also the files that lack a line break on the last line will be printed." +msgstr "Wenn zusätzlich die Option C<-e> oder C<--add-eol> verwendet wird, dann werden auch die Dateien ausgegeben, denen der Zeilenumbruch an der letzten Zeile fehlt." + #. type: =item -#: dos2unix.pod:326 +#: dos2unix.pod:343 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:345 msgid "Print a header." msgstr "gibt eine Kopfzeile aus." #. type: =item -#: dos2unix.pod:330 +#: dos2unix.pod:347 msgid "B

" msgstr "B

" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:349 msgid "Show file names without path." msgstr "zeigt Dateinamen ohne Pfade an." #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:353 msgid "Examples:" msgstr "Beispiele:" #. type: textblock -#: dos2unix.pod:338 +#: dos2unix.pod:355 msgid "Show information for all *.txt files:" msgstr "Informationen zu allen *.txt-Dateien anzeigen:" #. type: verbatim -#: dos2unix.pod:340 +#: dos2unix.pod:357 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -557,12 +591,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:342 +#: dos2unix.pod:359 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Nur die Anzahl der DOS-Zeilenumbrüche und Unix-Zeilenumbrüche anzeigen:" #. type: verbatim -#: dos2unix.pod:344 +#: dos2unix.pod:361 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -572,12 +606,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:346 +#: dos2unix.pod:363 msgid "Show only the byte order mark:" msgstr "Nur die Markierung der Bytereihenfolge anzeigen:" #. type: verbatim -#: dos2unix.pod:348 +#: dos2unix.pod:365 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -587,12 +621,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:350 +#: dos2unix.pod:367 msgid "List the files that have DOS line breaks:" msgstr "Die Dateien auflisten, die DOS-Zeilenumbrüche enthalten:" #. type: verbatim -#: dos2unix.pod:352 +#: dos2unix.pod:369 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -602,12 +636,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:354 +#: dos2unix.pod:371 msgid "List the files that have Unix line breaks:" msgstr "Die Dateien auflisten, die Unix-Zeilenumbrüche enthalten:" #. type: verbatim -#: dos2unix.pod:356 +#: dos2unix.pod:373 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -617,12 +651,27 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:358 +#: dos2unix.pod:375 +msgid "List the files that have DOS line breaks or lack a line break on the last line:" +msgstr "Die Dateien auflisten, die DOS-Zeilenumbrüche enthalten oder bei denen der Zeilenumbruch nach der letzten Zeile fehlt:" + +#. type: verbatim +#: dos2unix.pod:377 +#, no-wrap +msgid "" +" dos2unix -e -ic *.txt\n" +"\n" +msgstr "" +" dos2unix -e -ic *.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:379 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "Nur Dateien umwandeln, die DOS-Zeilenumbrüche enthalten und die anderen Dateien unverändert belassen:" #. type: verbatim -#: dos2unix.pod:360 +#: dos2unix.pod:381 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -632,12 +681,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:362 +#: dos2unix.pod:383 msgid "Find text files that have DOS line breaks:" msgstr "Nach Textdateien suchen, die DOS-Zeilenumbrüche enthalten:" #. type: verbatim -#: dos2unix.pod:364 +#: dos2unix.pod:385 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -647,166 +696,157 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:366 +#: dos2unix.pod:387 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:368 +#: dos2unix.pod:389 msgid "Keep the date stamp of output file same as input file." msgstr "übernimmt den Zeitstempel der Eingabedatei in die Ausgabedatei." #. type: =item -#: dos2unix.pod:370 +#: dos2unix.pod:391 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:372 +#: dos2unix.pod:393 msgid "Display program's license." msgstr "zeigt die Lizenz des Programms an." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:395 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:397 msgid "Add additional newline." msgstr "fügt eine zusätzliche neue Zeile hinzu." #. type: textblock -#: dos2unix.pod:378 +#: dos2unix.pod:399 msgid "B: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B: Nur DOS-Zeilenumbrüche werden in Unix-Zeilenumbrüche umgewandelt. Im Mac-Modus werden nur Mac-Zeilenumbrüche in Unix-Zeilenumbrüche umgewandelt." #. type: textblock -#: dos2unix.pod:382 +#: dos2unix.pod:403 msgid "B: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B: Nur Unix-Zeilenumbrüche werden in DOS-Zeilenumbrüche umgewandelt. Im Mac-Modus werden nur Unix-Zeilenumbrüche in Mac-Zeilenumbrüche umgewandelt." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:406 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:408 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "schreibt eine Markierung der Bytereihenfolge (BOM) in die Ausgabedatei. In der Voreinstellung wird eine UTF-8-BOM geschrieben." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:411 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "Wenn die Eingabedatei in UTF-16 kodiert ist und die Option C<-u> verwendet wird, wird eine UTF-16-BOM geschrieben." #. type: textblock -#: dos2unix.pod:393 +#: dos2unix.pod:414 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "Verwenden Sie diese Option niemals, wenn die Kodierung der Ausgabedatei nicht UTF-8, UTF-16 oder GB 18030 ist. Weitere Informationen finden Sie im Abschnitt UNICODE." #. type: =item -#: dos2unix.pod:397 +#: dos2unix.pod:418 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile EINGABEDATEI AUSGABEDATEI …>" #. type: textblock -#: dos2unix.pod:399 +#: dos2unix.pod:420 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I be used or you I lose your files." msgstr "Neue-Datei-Modus. Die EINGABEDATEI wird umgewandelt und in die AUSGABEDATEI geschrieben. Die Dateinamen müssen paarweise angegeben werden. Platzhalter sollten I verwendet werden, sonst werden Sie Ihre Dateien I." #. type: textblock -#: dos2unix.pod:403 +#: dos2unix.pod:424 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "Der Benutzer, der die Umwandlung im Neue-Datei-Modus startet, wird Besitzer der umgewandelten Datei. Die Lese- und Schreibrechte werden aus den Zugriffsrechten der Originaldatei minus der umask(1) der Person ermittelt, die die Umwandlung ausgeführt hat." #. type: =item -#: dos2unix.pod:408 +#: dos2unix.pod:429 msgid "B<--no-allow-chown>" msgstr "B<--no-allow-chown>" #. type: textblock -#: dos2unix.pod:410 +#: dos2unix.pod:431 msgid "Don't allow file ownership change in old file mode (default)." msgstr "verhindert die Änderung des Eigentümers der Datei im Alte-Datei-Modus (Voreinstellung)." #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:433 msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." msgstr "bricht die Umwandlung ab, wenn der Eigentümer und/oder die Gruppe der Originaldatei im Alte-Datei-Modus nicht erhalten werden kann. Siehe auch die Optionen C<-o> und C<-n>. Diese Option ist nur verfügbar, wenn dos2unix über Unterstützung für die Erhaltung des Eigentümers und der Gruppe von Dateien verfügt." #. type: =item -#: dos2unix.pod:417 -#, fuzzy -#| msgid "B<-m, --add-bom>" +#: dos2unix.pod:438 msgid "B<--no-add-eol>" -msgstr "B<-m, --add-bom>" +msgstr "B<--no-add-eol>" #. type: textblock -#: dos2unix.pod:419 +#: dos2unix.pod:440 msgid "Do not add a line break to the last line if there isn't one." -msgstr "" +msgstr "fügt keinen Zeilenumbruch nach der letzten Zeile hinzu, falls ein solcher nicht existiert." #. type: =item -#: dos2unix.pod:421 -#, fuzzy -#| msgid "B<-q, --quiet>" +#: dos2unix.pod:442 msgid "B<-O, --to-stdout>" -msgstr "B<-q, --quiet>" +msgstr "B<-O, --to-stdout>" #. type: textblock -#: dos2unix.pod:423 +#: dos2unix.pod:444 msgid "Write to standard output, like a Unix filter. Use option C<-o> to go back to old file (in-place) mode." -msgstr "" +msgstr "schreibt wie ein Unix-Filter in die Standardausgabe. Mit der Option C<-o> können Sie zum Alte-Datei-Modus (Ersetzungsmodus) zurückkehren." #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:447 msgid "Combined with option C<-e> files can be properly concatenated. No merged last and first lines, and no Unicode byte order marks in the middle of the concatenated file. Example:" -msgstr "" +msgstr "In Kombination mit der Option C<-e> können Dateien korrekt aneinandergehängt werden. Weder werden Zeilen ohne Umbruch zusammengeführt, noch werden Unicode-Markierungen der Bytereihenfolge mitten in die verkettete Datei gesetzt. Beispiel:" #. type: verbatim -#: dos2unix.pod:430 -#, fuzzy, no-wrap -#| msgid "" -#| " dos2unix -ul -n in.txt out.txt\n" -#| "\n" +#: dos2unix.pod:451 +#, no-wrap msgid "" " dos2unix -e -O file1.txt file2.txt > output.txt\n" "\n" msgstr "" -" dos2unix -ul -n eingabe.txt ausgabe.txt\n" +" dos2unix -e -O Datei1.txt Datei2.txt > Ausgabe.txt\n" "\n" #. type: =item -#: dos2unix.pod:432 -#, fuzzy -#| msgid "B<-o, --oldfile FILE ...>" +#: dos2unix.pod:453 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile DATEI …>" #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:455 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "Alte-Datei-Modus. Die DATEI wird umgewandelt und durch die Ausgabedatei überschrieben. Per Vorgabe werden Umwandlungen in diesem Modus ausgeführt. Platzhalter sind verwendbar." #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:458 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "Im Alte-Datei-Modus (Ersetzungsmodus) erhalten die umgewandelten Dateien den gleichen Eigentümer, die gleiche Gruppe und die gleichen Lese- und Schreibberechtigungen wie die Originaldatei, auch wenn die Datei von einem anderen Benutzer umgewandelt wird, der Schreibrechte für die Datei hat (zum Beispiel der Systemadministrator). Die Umwandlung wird abgebrochen, wenn es nicht möglich ist, die originalen Werte beizubehalten. Die Änderung des Eigentümers könnte zum Beispiel bewirken, dass der ursprüngliche Eigentümer die Datei nicht mehr lesen kann. Die Änderung der Gruppe könnte ein Sicherheitsrisiko sein, da die Datei vielleicht für Benutzer lesbar wird, für die sie nicht bestimmt ist. Die Beibehaltung von Eigentümer, Gruppe und Schreib- und Leserechten wird nur unter Unix unterstützt." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:467 msgid "To check if dos2unix has support for preserving the user and group ownership of files type C." msgstr "Um herauszufinden, ob dos2unix über Unterstützung für die Erhaltung von Eigentümer und Gruppe von Dateien verfügt, rufen Sie C auf." #. type: textblock -#: dos2unix.pod:449 +#: dos2unix.pod:470 msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" msgstr "Die Umwandlung führt stets über eine temporäre Datei. Tritt im Laufe der Umwandlung ein Fehler auf, wird die temporäre Datei gelöscht und die Originaldatei bleibt intakt. War die Umwandlung erfolgreich, wird die Originaldatei durch die temporäre Datei ersetzt. Sie können Schreibrechte für die Originaldatei haben, aber keine Rechte, um die gleichen Eigentumsverhältnisse wie die der Originaldatei für die temporäre Datei festzulegen. Das bedeutet, dass Sie Eigentümer und Gruppe der Originaldatei nicht bewahren können. In diesem Fall können Sie die Option C<--allow-chown> verwenden, um die Umwandlung fortzusetzen:" #. type: verbatim -#: dos2unix.pod:458 +#: dos2unix.pod:479 #, no-wrap msgid "" " dos2unix --allow-chown foo.txt\n" @@ -816,12 +856,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:460 +#: dos2unix.pod:481 msgid "Another option is to use new file mode:" msgstr "Eine weitere Option ist der Neue-Datei-Modus:" #. type: verbatim -#: dos2unix.pod:462 +#: dos2unix.pod:483 #, no-wrap msgid "" " dos2unix -n foo.txt foo.txt\n" @@ -831,227 +871,227 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:485 msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." msgstr "Der Vorteil der Option C<--allow-chown> ist, dass Sie Platzhalter verwenden können und die Eigentumsverhältnisse bewahrt bleiben, sofern möglich." #. type: =item -#: dos2unix.pod:467 +#: dos2unix.pod:488 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:469 +#: dos2unix.pod:490 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Stiller Modus, in dem alle Warnungen und sonstige Meldungen unterdrückt werden. Der Rückgabewert ist 0, außer wenn fehlerhafte Befehlszeilenoptionen angegeben werden." #. type: =item -#: dos2unix.pod:472 +#: dos2unix.pod:493 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:495 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "entfernt die Markierung der Bytereihenfolge (BOM). Es wird keine BOM in die Ausgabedatei geschrieben. Dies ist das Standardverhalten beim Umwandeln von Unix-Zeilenumbrüchen. Siehe auch die Option C<-b>." #. type: =item -#: dos2unix.pod:478 +#: dos2unix.pod:499 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:501 msgid "Skip binary files (default)." msgstr "überspringt Binärdateien (Vorgabe)." #. type: textblock -#: dos2unix.pod:482 +#: dos2unix.pod:503 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "Binärdateien werden übersprungen, damit unerwünschtes Fehlverhalten vermieden wird. Denken Sie daran, dass die Erkennung nicht 100% sicher funktioniert. Die übergebenen Dateien werden auf Binärsymbole überprüft, die typischerweise in Textdateien nicht vorkommen. Es ist jedoch möglich, dass eine Binärdatei ausschließlich gewöhnliche Textzeichen enthält. Eine solche Binärdatei wird dann fälschlicherweise als Textdatei angesehen." #. type: =item -#: dos2unix.pod:488 +#: dos2unix.pod:509 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:490 +#: dos2unix.pod:511 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "erhält die originale UTF-16-Kodierung der Eingabedatei. Die Ausgabedatei wird in der gleichen UTF-16-Kodierung geschrieben (Little-Endian- oder Big-Endian-Bytereihenfolge) wie die Eingabedatei. Dies verhindert die Umwandlung in UTF-8. Eine UTF-16-BOM wird dementsprechend geschrieben. Diese Option kann durch Angabe der Option C<-ascii> deaktiviert werden." #. type: =item -#: dos2unix.pod:495 +#: dos2unix.pod:516 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:497 +#: dos2unix.pod:518 msgid "Assume that the input file format is UTF-16LE." msgstr "nimmt an, dass die Eingabedatei das Format UTF-16LE hat." #. type: textblock -#: dos2unix.pod:499 +#: dos2unix.pod:520 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "Wenn die Eingabedatei eine Markierung der Bytereihenfolge enthält (BOM), dann hat die BOM Vorrang vor dieser Option." #. type: textblock -#: dos2unix.pod:502 +#: dos2unix.pod:523 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "Durch eine falsche Annahme (die Eingabedatei war nicht in UTF-16LE kodiert) mit erfolgreicher Umwandlung erhalten Sie eine UTF-8-Ausgabedatei mit fehlerhaftem Text. Sie können die fehlgeschlagene Umwandlung mit iconv(1) rückgängig machen, indem Sie die Rückumwandlung von UTF-8 nach UTF-16LE vornehmen. Dadurch gewinnen Sie die Originaldatei zurück." #. type: textblock -#: dos2unix.pod:507 +#: dos2unix.pod:528 msgid "The assumption of UTF-16LE works as a I. By switching to the default I mode the UTF-16LE assumption is turned off." msgstr "Die Annahme von UTF-16LE wirkt wie ein I. Beim Wechsel zum vorgegebenen I-Modus wird die UTF16LE-Annahme deaktiviert." #. type: =item -#: dos2unix.pod:510 +#: dos2unix.pod:531 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:512 +#: dos2unix.pod:533 msgid "Assume that the input file format is UTF-16BE." msgstr "nimmt an, dass die Eingabedatei das Format UTF-16BE hat." #. type: textblock -#: dos2unix.pod:514 +#: dos2unix.pod:535 msgid "This option works the same as option C<-ul>." msgstr "Diese Option ist gleichbedeutend mit C<-ul>." #. type: =item -#: dos2unix.pod:516 +#: dos2unix.pod:537 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:518 +#: dos2unix.pod:539 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "zeigt ausführliche Meldungen an. Zusätzliche Informationen werden zu den Markierungen der Bytereihenfolge (BOM) und zur Anzahl der umgewandelten Zeilenumbrüche angezeigt." #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:542 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:523 +#: dos2unix.pod:544 msgid "Follow symbolic links and convert the targets." msgstr "folgt symbolischen Links und wandelt die Zieldateien um." #. type: =item -#: dos2unix.pod:525 +#: dos2unix.pod:546 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:527 +#: dos2unix.pod:548 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "ersetzt symbolische Links durch die umgewandelten Dateien (die originalen Zieldateien bleiben unverändert)." #. type: =item -#: dos2unix.pod:530 +#: dos2unix.pod:551 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:532 +#: dos2unix.pod:553 msgid "Keep symbolic links and targets unchanged (default)." msgstr "erhält symbolische Links als solche und lässt die Ziele unverändert (Vorgabe)." #. type: =item -#: dos2unix.pod:534 +#: dos2unix.pod:555 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:536 +#: dos2unix.pod:557 msgid "Display version information and exit." msgstr "zeigt Versionsinformationen an und beendet das Programm." #. type: =head1 -#: dos2unix.pod:540 +#: dos2unix.pod:561 msgid "MAC MODE" msgstr "MAC-MODUS" #. type: textblock -#: dos2unix.pod:542 -msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." -msgstr "Im Normalmodus werden Zeilenumbrüche von DOS nach Unix und umgekehrt umgewandelt. Mac-Zeilenumbrüche werden nicht verändert." +#: dos2unix.pod:563 +msgid "By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." +msgstr "In der Voreinstellung werden Zeilenumbrüche von DOS nach Unix und umgekehrt umgewandelt. Mac-Zeilenumbrüche werden nicht verändert." #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:566 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "Im Mac-Modus werden Zeilenumbrüche von Mac nach Unix und umgekehrt umgewandelt. DOS-Zeilenumbrüche werden nicht verändert." #. type: textblock -#: dos2unix.pod:548 +#: dos2unix.pod:569 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C or C." msgstr "Um das Programm im Mac-Modus auszuführen, verwenden Sie die Befehlszeilenoption C<-c mac> oder die Befehle C oder C." #. type: =head1 -#: dos2unix.pod:551 +#: dos2unix.pod:572 msgid "CONVERSION MODES" msgstr "UMWANDLUNGSMODI" #. type: =item -#: dos2unix.pod:555 +#: dos2unix.pod:576 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:557 -msgid "In mode C only line breaks are converted. This is the default conversion mode." -msgstr "Im C-Modus werden nur Zeilenumbrüche umgewandelt. Dies ist der vorgegebene Umwandlungsmodus." +#: dos2unix.pod:578 +msgid "This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling B mode disables B<7bit> and B mode." +msgstr "Dies ist der vorgegebene Umwandlungsmodus. Dieser Modus dient zum Umwandeln von ASCII- und ASCII-kompatibel kodierten Dateien, wie UTF-8. Durch Aktivierung des B-Modus werden die Modi B<7bit> und B deaktiviert." #. type: textblock -#: dos2unix.pod:560 -msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." -msgstr "Obwohl der Name dieses Modus auf ASCII hinweist, welches ein 7-bit-Standard ist, bezieht sich der eigentliche Modus auf 8 Bit. Verwenden Sie diesen Modus immer dann, wenn Sie Unicode-Dateien in UTF-8-Kodierung umwandeln." +#: dos2unix.pod:582 +msgid "If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has UTF-16 support type C. See also section UNICODE." +msgstr "Falls dos2unix über Unterstützung für UTF-16 verfügt, werden UTF-16-kodierte Dateien auf POSIX-Systemen in die aktuelle Zeichenkodierung der Locale und unter Windows in UTF-8 umgewandelt. Die Aktivierung des B-Modus deaktiviert die Option C<-u> zum Erhalten der UTF-16-Kodierung sowie die Optionen C<-ul> und C<-ub>, welche davon ausgehen, dass die Eingabe in UTF-16 kodiert ist. Geben Sie den Befehl C ein, um zu sehen, ob dos2unix UTF-16 unterstützt. Weitere Informationen hierzu finden Sie im Abschnitt UNICODE." #. type: =item -#: dos2unix.pod:564 +#: dos2unix.pod:588 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:566 +#: dos2unix.pod:590 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "In diesem Modus werden alle Nicht-ASCII-Zeichen aus 8 Bit in das 7-Bit-Bitmuster umgewandelt." #. type: =item -#: dos2unix.pod:569 +#: dos2unix.pod:593 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:571 +#: dos2unix.pod:595 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Die Zeichen werden aus dem DOS-Zeichensatz (der Codepage) in den ISO-Zeichensatz ISO-8859-1 (Latin-1) in Unix umgewandelt. DOS-Zeichen ohne Äquivalent in ISO-8859-1, für die die Umwandlung nicht möglich ist, werden durch einen Punkt ersetzt. Gleiches gilt für ISO-8859-1-Zeichen ohne DOS-Gegenstück." #. type: textblock -#: dos2unix.pod:576 +#: dos2unix.pod:600 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "Wenn nur die Option C<-iso> angegeben ist, versucht dos2unix die aktive Codepage selbst zu ermitteln. Sollte dies nicht möglich sein, wird die Standard-Codepage CP437 verwendet, welche hauptsächlich in den USA eingesetzt wird. Um eine bestimmte Codepage zu erzwingen, verwenden Sie die Optionen C<-437> (US), C<-850> (Westeuropäisch), C<-860> (Portugiesisch), C<-863> (Kanadisches Französisch) oder C<-865> (Skandinavisch). Die Windows-Codepage CP1252 (Westeuropäisch) wird durch die Option C<-1252> unterstützt." #. type: textblock -#: dos2unix.pod:585 +#: dos2unix.pod:609 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "Wenden Sie niemals die ISO-Umwandlung auf Unicode-Textdateien an. In UTF-8 kodierte Dateien werden dadurch beschädigt." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:611 msgid "Some examples:" msgstr "Einige Beispiele:" #. type: textblock -#: dos2unix.pod:589 +#: dos2unix.pod:613 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Umwandlung aus der vorgegebenen DOS-Codepage nach Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:591 +#: dos2unix.pod:615 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -1061,12 +1101,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:593 +#: dos2unix.pod:617 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Umwandlung von DOS CP850 nach Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:595 +#: dos2unix.pod:619 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -1076,12 +1116,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:597 +#: dos2unix.pod:621 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Umwandlung von Windows CP1252 nach Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:599 +#: dos2unix.pod:623 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -1091,12 +1131,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:601 +#: dos2unix.pod:625 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Umwandlung von Windows CP1252 nach Unix UTF-8 (Unicode):" #. type: verbatim -#: dos2unix.pod:603 +#: dos2unix.pod:627 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -1106,12 +1146,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:605 +#: dos2unix.pod:629 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Umwandlung von Unix Latin-1 in die vorgegebene DOS-Codepage:" #. type: verbatim -#: dos2unix.pod:607 +#: dos2unix.pod:631 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -1121,12 +1161,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:609 +#: dos2unix.pod:633 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Umwandlung von Unix Latin-1 nach DOS CP850:" #. type: verbatim -#: dos2unix.pod:611 +#: dos2unix.pod:635 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1136,12 +1176,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:637 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Umwandlung von Unix Latin-1 nach Windows CP1252:" #. type: verbatim -#: dos2unix.pod:615 +#: dos2unix.pod:639 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1151,12 +1191,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:617 +#: dos2unix.pod:641 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Umwandlung von Unix UTF-8 (Unicode) nach Windows CP1252:" #. type: verbatim -#: dos2unix.pod:619 +#: dos2unix.pod:643 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1166,142 +1206,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:621 +#: dos2unix.pod:645 msgid "See also L and L." msgstr "Siehe auch L und L." #. type: =head1 -#: dos2unix.pod:626 +#: dos2unix.pod:650 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:628 +#: dos2unix.pod:652 msgid "Encodings" msgstr "Zeichenkodierungen" #. type: textblock -#: dos2unix.pod:630 +#: dos2unix.pod:654 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Es gibt verschiedene Unicode-Zeichenkodierungen. Unter Unix und Linux sind Unicode-Dateien typischerweise in UTF-8 kodiert. Unter Windows können Textdateien in UTF-8, UTF-16 oder UTF-16 in Big-Endian-Bytereihenfolge kodiert sein, liegen aber meist im Format UTF-16 vor." #. type: =head2 -#: dos2unix.pod:635 +#: dos2unix.pod:659 msgid "Conversion" msgstr "Umwandlung" #. type: textblock -#: dos2unix.pod:637 -msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." -msgstr "Unicode-Textdateien können DOS-, Unix- oder Mac-Zeilenumbrüche enthalten, so wie reguläre Textdateien." +#: dos2unix.pod:661 +msgid "Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files." +msgstr "Unicode-Textdateien können DOS-, Unix- oder Mac-Zeilenumbrüche enthalten, so wie ASCII-Textdateien." #. type: textblock -#: dos2unix.pod:640 +#: dos2unix.pod:664 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Alle Versionen von dos2unix und unix2dos können UTF-8-kodierte Dateien umwandeln, weil UTF-8 im Hinblick auf Abwärtskompatibilität mit ASCII entwickelt wurde." #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:667 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C." msgstr "Dos2unix und unix2dos mit Unterstützung für UTF-16 können in UTF-16 kodierte Dateien in Little-Endian- und Big-Endian-Bytereihenfolge lesen. Um festzustellen, ob dos2unix mit UTF-16-Unterstützung kompiliert wurde, geben Sie C ein." #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:671 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "Unter Unix/Linux werden UTF-16 kodierte Dateien standardmäßig in die Zeichenkodierung entsprechend der Locale umgewandelt. Mit dem Befehl locale(1) können Sie herausfinden, wie die Zeichenkodierung der Locale eingestellt ist. Wenn eine Umwandlung nicht möglich ist, verursacht dies einen Umwandlungsfehler, wodurch die Datei übersprungen wird." #. type: textblock -#: dos2unix.pod:652 +#: dos2unix.pod:676 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "Unter Windows werden UTF-16-Dateien standardmäßig in UTF-8 umgewandelt. In UTF-8 formatierte Textdateien werden von Windows und Unix/Linux gleichermaßen unterstützt." #. type: textblock -#: dos2unix.pod:655 +#: dos2unix.pod:679 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "Die Kodierungen UTF-16 und UTF-8 sind vollständig kompatibel, daher wird bei der Umwandlung keinerlei Text verlorengehen. Sollte bei der Umwandlung von UTF-16 in UTF-8 ein Problem auftreten, beispielsweise wenn die UTF-16-kodierte Eingabedatei einen Fehler enthält, dann wird diese Datei übersprungen." #. type: textblock -#: dos2unix.pod:659 +#: dos2unix.pod:683 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "Wenn die Option C<-u> verwendet wird, wird die Ausgabedatei in der gleichen UTF-16-Kodierung wie die Eingabedatei geschrieben. Die Option C<-u> verhindert die Umwandlung in UTF-8." #. type: textblock -#: dos2unix.pod:662 +#: dos2unix.pod:686 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "Dos2unix und unix2dos bieten keine Option zur Umwandlung von UTF-8-Dateien in UTF-16." #. type: textblock -#: dos2unix.pod:664 +#: dos2unix.pod:688 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "Umwandlungen im ISO- und 7bit-Modus funktionieren mit UTF-16-Dateien nicht." #. type: =head2 -#: dos2unix.pod:666 +#: dos2unix.pod:690 msgid "Byte Order Mark" msgstr "Markierung der Bytereihenfolge" #. type: textblock -#: dos2unix.pod:668 -msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." -msgstr "Unicode-Textdateien unter Windows haben typischerweise eine Markierung der Bytereihenfolge (BOM), da viele Windows-Programme (zum Beispiel Notepad) solche BOMs standardmäßig hinzufügen. Weitere Informationen hierzu finden Sie auf L." +#: dos2unix.pod:692 +msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." +msgstr "Unicode-Textdateien unter Windows haben typischerweise eine Markierung der Bytereihenfolge (BOM), da viele Windows-Programme (zum Beispiel Notepad) solche BOMs standardmäßig hinzufügen. Weitere Informationen hierzu finden Sie auf L." #. type: textblock -#: dos2unix.pod:672 +#: dos2unix.pod:696 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "Unter Unix haben Textdateien üblicherweise keine BOM. Es wird stattdessen angenommen, dass Textdateien in der Zeichenkodierung entsprechend der Spracheinstellung vorliegen." #. type: textblock -#: dos2unix.pod:675 +#: dos2unix.pod:699 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "Dos2unix kann nur dann erkennen, ob eine Datei UTF-16-kodiert ist, wenn die Datei eine BOM enthält. Ist dies nicht der Fall, nimmt dos2unix an, dass es sich um eine Binärdatei handelt." #. type: textblock -#: dos2unix.pod:679 +#: dos2unix.pod:703 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Verwenden Sie die Optionen C<-ul> oder C<-ub>, um eine UTF-16-Datei ohne BOM umzuwandeln." #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:705 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "Dos2unix schreibt in der Voreinstellung keine BOM in die Ausgabedatei. Mit der Option C<-b> schreibt Dos2unix eine BOM, wenn die Eingabedatei ebenfalls eine BOM hat." #. type: textblock -#: dos2unix.pod:684 +#: dos2unix.pod:708 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "Unix2dos schreibt in der Voreinstellung eine BOM in die Ausgabedatei, wenn die Eingabedatei ebenfalls eine solche Markierung hat. Verwenden Sie die Option C<-r>, um die BOM zu entfernen." #. type: textblock -#: dos2unix.pod:687 +#: dos2unix.pod:711 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "Dos2unix und unix2dos schreiben immer eine BOM, wenn die Option C<-m> angegeben ist." #. type: =head2 -#: dos2unix.pod:689 +#: dos2unix.pod:713 msgid "Unicode file names on Windows" msgstr "Unicode-Dateinamen unter Windows" #. type: textblock -#: dos2unix.pod:691 +#: dos2unix.pod:715 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C." msgstr "Dos2unix verfügt über optionale Unterstützung für das Lesen und Schreiben von Unicode-Dateinamen in der Windows-Eingabeaufforderung. Dadurch kann dos2unix Dateien öffnen, deren Namen Zeichen enthalten, die nicht zur Standard-ANSI-Codepage des Systems gehören. Geben Sie C ein, um zu sehen, ob dos2unix für Windows mit Unterstützung für Unicode-Dateinamen erstellt wurde." #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:721 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "Die Anzeige von Unicode-Dateinamen in einer Windows-Konsole ist gelegentlich nicht fehlerfrei, siehe die Option C<-D>, C<--display-enc>. Die Dateinamen können falsch dargestellt werden, allerdings werden die Dateien mit deren korrekten Namen gespeichert." #. type: =head2 -#: dos2unix.pod:701 +#: dos2unix.pod:725 msgid "Unicode examples" msgstr "Unicode-Beispiele" #. type: textblock -#: dos2unix.pod:703 +#: dos2unix.pod:727 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Umwandlung von Windows UTF-16 (mit BOM) nach Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:705 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1311,12 +1351,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:731 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Umwandlung von Windows UTF-16LE (ohne BOM) nach Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:733 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1326,12 +1366,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:735 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Umwandlung von Unix UTF-8 nach Windows UTF-8 mit BOM:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:737 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1341,12 +1381,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:739 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Umwandlung von Unix UTF-8 nach Windows UTF-16:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:741 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1356,47 +1396,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:719 +#: dos2unix.pod:743 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:721 -msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." -msgstr "GB18030 ist ein Standard der chinesischen Regierung. Eine Teilmenge des in GB18030 definierten Standards ist offiziell für alle in China verkauften Softwareprodukte vorgeschrieben. Siehe auch L." +#: dos2unix.pod:745 +msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." +msgstr "GB18030 ist ein Standard der chinesischen Regierung. Eine Teilmenge des in GB18030 definierten Standards ist offiziell für alle in China verkauften Softwareprodukte vorgeschrieben. Siehe auch L." #. type: textblock -#: dos2unix.pod:725 +#: dos2unix.pod:749 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "GB18030 ist vollständig zu Unicode kompatibel und kann als Unicode-Umwandlungsformat betrachtet werden. Wie auch UTF-8 ist GB18030 kompatibel zu ASCII. Ebenfalls kompatibel ist es zur Codepage 936 von Windows, auch als GBK bekannt." #. type: textblock -#: dos2unix.pod:729 +#: dos2unix.pod:753 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C to get the list of supported locales." msgstr "Unter Unix/Linux werden UTF-16-Dateien in GB18030 umgewandelt, wenn die Einstellung der Locale auf GB18030 gesetzt ist. Beachten Sie, dass dies nur funktioniert, wenn die Locale vom System unterstützt wird. Mit dem Befehl C erhalten Sie eine Liste der unterstützten Locales." #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:757 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "Unter Windows benötigen Sie die Option C<-gb>, um UTF-16-Dateien in GB18030 umwandeln zu können." #. type: textblock -#: dos2unix.pod:735 +#: dos2unix.pod:759 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "In GB 18030 kodierte Dateien haben wie Unicode-Dateien eine Markierung der Bytereihenfolge (BOM)." #. type: =head1 -#: dos2unix.pod:737 +#: dos2unix.pod:761 msgid "EXAMPLES" msgstr "BEISPIELE" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:763 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Aus der Standardeingabe lesen und in die Standardausgabe schreiben:" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:765 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1408,12 +1448,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:744 +#: dos2unix.pod:768 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "a.txt umwandeln und ersetzen, b.txt umwandeln und ersetzen:" #. type: verbatim -#: dos2unix.pod:746 +#: dos2unix.pod:770 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1425,12 +1465,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:749 +#: dos2unix.pod:773 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "a.txt im ascii-Modus umwandeln und ersetzen:" #. type: verbatim -#: dos2unix.pod:751 +#: dos2unix.pod:775 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1440,12 +1480,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:753 +#: dos2unix.pod:777 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "a.txt im ascii-Modus umwandeln und ersetzen, b.txt im 7bit-Modus umwandeln und ersetzen:" #. type: verbatim -#: dos2unix.pod:756 +#: dos2unix.pod:780 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1459,12 +1499,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:760 +#: dos2unix.pod:784 msgid "Convert a.txt from Mac to Unix format:" msgstr "a.txt aus dem Mac- in das Unix-Format umwandeln:" #. type: verbatim -#: dos2unix.pod:762 +#: dos2unix.pod:786 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1476,12 +1516,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:765 +#: dos2unix.pod:789 msgid "Convert a.txt from Unix to Mac format:" msgstr "a.txt aus dem Unix- in das Mac-Format umwandeln:" #. type: verbatim -#: dos2unix.pod:767 +#: dos2unix.pod:791 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1493,12 +1533,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:770 +#: dos2unix.pod:794 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "a.txt unter Beibehaltung des ursprünglichen Zeitstempels umwandeln:" #. type: verbatim -#: dos2unix.pod:772 +#: dos2unix.pod:796 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1510,12 +1550,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:775 +#: dos2unix.pod:799 msgid "Convert a.txt and write to e.txt:" msgstr "a.txt umwandeln und das Ergebnis nach e.txt schreiben:" #. type: verbatim -#: dos2unix.pod:777 +#: dos2unix.pod:801 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1525,12 +1565,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:779 +#: dos2unix.pod:803 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "a.txt umwandeln und das Ergebnis nach e.txt schreiben, wobei e.txt den gleichen Zeitstempel erhält wie a.txt:" #. type: verbatim -#: dos2unix.pod:781 +#: dos2unix.pod:805 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1540,12 +1580,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:783 +#: dos2unix.pod:807 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "a.txt umwandeln und ersetzen, b.txt umwandeln und das Ergebnis nach e.txt schreiben:" #. type: verbatim -#: dos2unix.pod:785 +#: dos2unix.pod:809 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1557,12 +1597,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:788 +#: dos2unix.pod:812 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "c.txt umwandeln und das Ergebnis nach e.txt schreiben, a.txt umwandeln und ersetzen, b.txt umwandeln und ersetzen, d.txt umwandeln und das Ergebnis nach f.txt schreiben:" #. type: verbatim -#: dos2unix.pod:791 +#: dos2unix.pod:815 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1572,17 +1612,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:793 +#: dos2unix.pod:817 msgid "RECURSIVE CONVERSION" msgstr "REKURSIVE UMWANDLUNG" #. type: textblock -#: dos2unix.pod:795 +#: dos2unix.pod:819 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "In einer Unix-Shell können Sie dos2unix zusammen mit den Befehlen find(1) und xargs(1) verwenden, um Textdateien in einem Verzeichnisbaum rekursiv umzuwandeln. Um beispielsweise alle *.txt-Dateien im aktuellen Verzeichnis und dessen Unterverzeichnissen umzuwandeln, geben Sie Folgendes ein:" #. type: verbatim -#: dos2unix.pod:799 +#: dos2unix.pod:823 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1592,12 +1632,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:801 +#: dos2unix.pod:825 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "Die find(1)-Option C<-print0> und die korrespondierende xargs(1)-Option C<-0> werden für Dateien benötigt, deren Namen Leerzeichen oder Anführungszeichen enthalten. Ansonsten können diese Optionen weggelassen werden. Eine weitere Möglichkeit ist, find(1) zusammen mit der Option C<-exec> zu verwenden:" #. type: verbatim -#: dos2unix.pod:805 +#: dos2unix.pod:829 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1607,12 +1647,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:807 +#: dos2unix.pod:831 msgid "In a Windows Command Prompt the following command can be used:" msgstr "In einer Windows-Eingabeaufforderung kann der folgende Befehl verwendet werden:" #. type: verbatim -#: dos2unix.pod:809 +#: dos2unix.pod:833 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1622,12 +1662,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:811 +#: dos2unix.pod:835 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "In der Windows PowerShell können Sie folgenden Befehl verwenden:" #. type: verbatim -#: dos2unix.pod:813 +#: dos2unix.pod:837 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1637,22 +1677,22 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:816 +#: dos2unix.pod:840 msgid "LOCALIZATION" msgstr "LOKALISIERUNG" #. type: =item -#: dos2unix.pod:820 +#: dos2unix.pod:844 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:822 +#: dos2unix.pod:846 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "Die primäre Sprache wird durch die Umgebungsvariable LANG festgelegt. Diese Variable besteht aus mehreren Teilen: Der erste Teil besteht aus zwei Kleinbuchstaben, die den Sprachcode angeben. Der zweite Teil ist optional und bezeichnet den Ländercode in Großbuchstaben, vom davor stehenden Sprachcode durch einen Unterstrich getrennt. Der dritte Teil ist ebenfalls optional und gibt die Zeichenkodierung an, vom Ländercode durch einen Punkt getrennt. Einige Beispiele für Standard-POSIX-Shells:" #. type: verbatim -#: dos2unix.pod:829 +#: dos2unix.pod:853 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1674,47 +1714,47 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:837 -msgid "For a complete list of language and country codes see the gettext manual: L" -msgstr "Eine vollständige Liste der Sprachen und Ländercodes finden Sie im Gettext-Handbuch: L" +#: dos2unix.pod:861 +msgid "For a complete list of language and country codes see the gettext manual: L" +msgstr "Eine vollständige Liste der Sprachen und Ländercodes finden Sie im Gettext-Handbuch: L" #. type: textblock -#: dos2unix.pod:840 +#: dos2unix.pod:864 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "Auf Unix-Systemen erhalten Sie mit dem Befehl locale(1) spezifische Informationen zu den Spracheinstellungen." #. type: =item -#: dos2unix.pod:843 +#: dos2unix.pod:867 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:845 -msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" +#: dos2unix.pod:869 +msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" msgstr "Mit der Umgebungsvariable LANGUAGE können Sie eine Prioritätenliste für Sprachen übergeben, die Sie durch Doppelpunkte voneinander trennen. Dos2unix gibt LANGUAGE vor LANG den Vorzug, zum Beispiel bei Deutsch vor Niederländisch: C. Sie müssen zunächst die Lokalisierung aktivieren, indem Sie die Variable LANG (oder LC_ALL) auf einen anderen Wert als »C« setzen, bevor Sie die Liste der Sprachprioritäten mit der Variable LANGUAGE nutzen können. Weitere Informationen finden Sie im Gettext-Handbuch: L" #. type: textblock -#: dos2unix.pod:853 +#: dos2unix.pod:877 msgid "If you select a language which is not available you will get the standard English messages." msgstr "Falls Sie eine Sprache auswählen, die nicht verfügbar ist, erhalten Sie die Standardmeldungen in englischer Sprache." #. type: =item -#: dos2unix.pod:857 +#: dos2unix.pod:881 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:859 +#: dos2unix.pod:883 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C. Option B<--version> will display the LOCALEDIR that is used." msgstr "Durch die Umgebungsvariable DOS2UNIX_LOCALEDIR wird LOCALEDIR während der Kompilierung übergangen. LOCALEDIR wird verwendet, um Sprachdateien zu finden. Der GNU-Standardwert ist C. Die Option B<--version> zeigt das verwendete LOCALEDIR an." #. type: textblock -#: dos2unix.pod:864 +#: dos2unix.pod:888 msgid "Example (POSIX shell):" msgstr "Beispiel (POSIX-Shell):" #. type: verbatim -#: dos2unix.pod:866 +#: dos2unix.pod:890 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1724,71 +1764,71 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:871 +#: dos2unix.pod:895 msgid "RETURN VALUE" msgstr "RÜCKGABEWERT" #. type: textblock -#: dos2unix.pod:873 +#: dos2unix.pod:897 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "Bei Erfolg wird 0 zurückgegeben. Bei aufgetretenen Systemfehlern wird der letzte Systemfehler zurückgegeben. Für alle anderen Fehler wird 1 zurückgegeben." #. type: textblock -#: dos2unix.pod:876 +#: dos2unix.pod:900 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "Der Rückgabewert ist im stillen Modus stets 0, außer wenn fehlerhafte Befehlszeilenoptionen verwendet werden." #. type: =head1 -#: dos2unix.pod:879 +#: dos2unix.pod:903 msgid "STANDARDS" msgstr "STANDARDS" #. type: textblock -#: dos2unix.pod:881 -msgid "L" +#: dos2unix.pod:905 +msgid "L" msgstr "L" #. type: textblock -#: dos2unix.pod:883 -msgid "L" +#: dos2unix.pod:907 +msgid "L" msgstr "L" #. type: textblock -#: dos2unix.pod:885 -msgid "L" +#: dos2unix.pod:909 +msgid "L" msgstr "L" #. type: textblock -#: dos2unix.pod:887 -msgid "L" +#: dos2unix.pod:911 +msgid "L" msgstr "L" #. type: =head1 -#: dos2unix.pod:889 +#: dos2unix.pod:913 msgid "AUTHORS" msgstr "AUTOREN" #. type: textblock -#: dos2unix.pod:891 +#: dos2unix.pod:915 msgid "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer)" msgstr "Benjamin Lin - , Bernd Johannes Wuebben (Mac2unix-Modus) - , Christian Wurll (Extra Zeilenumbruch) - , Erwin Waterlander - (Betreuer)" #. type: textblock -#: dos2unix.pod:896 -msgid "Project page: L" +#: dos2unix.pod:920 +msgid "Project page: L" msgstr "Projektseite: L" #. type: textblock -#: dos2unix.pod:898 -msgid "SourceForge page: L" +#: dos2unix.pod:922 +msgid "SourceForge page: L" msgstr "SourceForge-Seite: L" #. type: =head1 -#: dos2unix.pod:900 +#: dos2unix.pod:924 msgid "SEE ALSO" msgstr "SIEHE AUCH" #. type: textblock -#: dos2unix.pod:902 +#: dos2unix.pod:926 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" diff --git a/dos2unix/po-man/dos2unix-man.pot b/dos2unix/po-man/dos2unix-man.pot index 0c74f11..fe6cf98 100644 --- a/dos2unix/po-man/dos2unix-man.pot +++ b/dos2unix/po-man/dos2unix-man.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2023-08-29 20:44+0200\n" +"POT-Creation-Date: 2024-01-22 21:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -169,7 +169,7 @@ msgstr "" #. type: textblock #: dos2unix.pod:121 -msgid "Convert only line breaks. This is the default conversion mode." +msgid "Default conversion mode. See also section CONVERSION MODES." msgstr "" #. type: =item @@ -490,7 +490,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:274 +#: dos2unix.pod:274 dos2unix.pod:290 msgid "Example output:" msgstr "" @@ -519,17 +519,35 @@ msgstr "" #. type: textblock #: dos2unix.pod:287 msgid "" +"If in addition option C<-e> or C<--add-eol> is used also the type of the " +"line break of the last line is printed, or C if there is none." +msgstr "" + +#. type: verbatim +#: dos2unix.pod:292 +#, no-wrap +msgid "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" +msgstr "" + +#. type: textblock +#: dos2unix.pod:297 +msgid "" "Optionally extra flags can be set to change the output. One or more flags " "can be added." msgstr "" #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:302 msgid "B<0>" msgstr "" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:304 msgid "" "Print the file information lines followed by a null character instead of a " "newline character. This enables correct interpretation of file names with " @@ -538,104 +556,123 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:299 +#: dos2unix.pod:309 msgid "B" msgstr "" #. type: textblock -#: dos2unix.pod:301 +#: dos2unix.pod:311 msgid "Print number of DOS line breaks." msgstr "" #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:313 msgid "B" msgstr "" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:315 msgid "Print number of Unix line breaks." msgstr "" #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:317 msgid "B" msgstr "" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:319 msgid "Print number of Mac line breaks." msgstr "" #. type: =item -#: dos2unix.pod:311 +#: dos2unix.pod:321 msgid "B" msgstr "" #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:323 msgid "Print the byte order mark." msgstr "" #. type: =item -#: dos2unix.pod:315 +#: dos2unix.pod:325 msgid "B" msgstr "" #. type: textblock -#: dos2unix.pod:317 +#: dos2unix.pod:327 msgid "Print if file is text or binary." msgstr "" #. type: =item -#: dos2unix.pod:319 +#: dos2unix.pod:329 +msgid "B" +msgstr "" + +#. type: textblock +#: dos2unix.pod:331 +msgid "" +"Print the type of the line break of the last line, or C if there is " +"none." +msgstr "" + +#. type: =item +#: dos2unix.pod:333 msgid "B" msgstr "" #. type: textblock -#: dos2unix.pod:321 +#: dos2unix.pod:335 msgid "Print only the files that would be converted." msgstr "" #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:337 msgid "" "With the C flag dos2unix will print only the files that contain DOS line " "breaks, unix2dos will print only file names that have Unix line breaks." msgstr "" +#. type: textblock +#: dos2unix.pod:340 +msgid "" +"If in addition option C<-e> or C<--add-eol> is used also the files that lack " +"a line break on the last line will be printed." +msgstr "" + #. type: =item -#: dos2unix.pod:326 +#: dos2unix.pod:343 msgid "B" msgstr "" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:345 msgid "Print a header." msgstr "" #. type: =item -#: dos2unix.pod:330 +#: dos2unix.pod:347 msgid "B

" msgstr "" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:349 msgid "Show file names without path." msgstr "" #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:353 msgid "Examples:" msgstr "" #. type: textblock -#: dos2unix.pod:338 +#: dos2unix.pod:355 msgid "Show information for all *.txt files:" msgstr "" #. type: verbatim -#: dos2unix.pod:340 +#: dos2unix.pod:357 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -643,12 +680,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:342 +#: dos2unix.pod:359 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "" #. type: verbatim -#: dos2unix.pod:344 +#: dos2unix.pod:361 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -656,12 +693,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:346 +#: dos2unix.pod:363 msgid "Show only the byte order mark:" msgstr "" #. type: verbatim -#: dos2unix.pod:348 +#: dos2unix.pod:365 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -669,12 +706,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:350 +#: dos2unix.pod:367 msgid "List the files that have DOS line breaks:" msgstr "" #. type: verbatim -#: dos2unix.pod:352 +#: dos2unix.pod:369 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -682,12 +719,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:354 +#: dos2unix.pod:371 msgid "List the files that have Unix line breaks:" msgstr "" #. type: verbatim -#: dos2unix.pod:356 +#: dos2unix.pod:373 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -695,14 +732,29 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:358 +#: dos2unix.pod:375 +msgid "" +"List the files that have DOS line breaks or lack a line break on the last " +"line:" +msgstr "" + +#. type: verbatim +#: dos2unix.pod:377 +#, no-wrap +msgid "" +" dos2unix -e -ic *.txt\n" +"\n" +msgstr "" + +#. type: textblock +#: dos2unix.pod:379 msgid "" "Convert only files that have DOS line breaks and leave the other files " "untouched:" msgstr "" #. type: verbatim -#: dos2unix.pod:360 +#: dos2unix.pod:381 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -710,12 +762,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:362 +#: dos2unix.pod:383 msgid "Find text files that have DOS line breaks:" msgstr "" #. type: verbatim -#: dos2unix.pod:364 +#: dos2unix.pod:385 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -723,82 +775,82 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:366 +#: dos2unix.pod:387 msgid "B<-k, --keepdate>" msgstr "" #. type: textblock -#: dos2unix.pod:368 +#: dos2unix.pod:389 msgid "Keep the date stamp of output file same as input file." msgstr "" #. type: =item -#: dos2unix.pod:370 +#: dos2unix.pod:391 msgid "B<-L, --license>" msgstr "" #. type: textblock -#: dos2unix.pod:372 +#: dos2unix.pod:393 msgid "Display program's license." msgstr "" #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:395 msgid "B<-l, --newline>" msgstr "" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:397 msgid "Add additional newline." msgstr "" #. type: textblock -#: dos2unix.pod:378 +#: dos2unix.pod:399 msgid "" "B: Only DOS line breaks are changed to two Unix line breaks. In " "Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "" #. type: textblock -#: dos2unix.pod:382 +#: dos2unix.pod:403 msgid "" "B: Only Unix line breaks are changed to two DOS line breaks. In " "Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "" #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:406 msgid "B<-m, --add-bom>" msgstr "" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:408 msgid "" "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is " "written." msgstr "" #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:411 msgid "" "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM " "will be written." msgstr "" #. type: textblock -#: dos2unix.pod:393 +#: dos2unix.pod:414 msgid "" "Never use this option when the output encoding is other than UTF-8, UTF-16, " "or GB18030. See also section UNICODE." msgstr "" #. type: =item -#: dos2unix.pod:397 +#: dos2unix.pod:418 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "" #. type: textblock -#: dos2unix.pod:399 +#: dos2unix.pod:420 msgid "" "New file mode. Convert file INFILE and write output to file OUTFILE. File " "names must be given in pairs and wildcard names should I be used or you " @@ -806,7 +858,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:403 +#: dos2unix.pod:424 msgid "" "The person who starts the conversion in new file (paired) mode will be the " "owner of the converted file. The read/write permissions of the new file will " @@ -815,17 +867,17 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:408 +#: dos2unix.pod:429 msgid "B<--no-allow-chown>" msgstr "" #. type: textblock -#: dos2unix.pod:410 +#: dos2unix.pod:431 msgid "Don't allow file ownership change in old file mode (default)." msgstr "" #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:433 msgid "" "Abort conversion when the user and/or group ownership of the original file " "can't be preserved in old file mode. See also options C<-o> and C<-n>. This " @@ -834,29 +886,29 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:417 +#: dos2unix.pod:438 msgid "B<--no-add-eol>" msgstr "" #. type: textblock -#: dos2unix.pod:419 +#: dos2unix.pod:440 msgid "Do not add a line break to the last line if there isn't one." msgstr "" #. type: =item -#: dos2unix.pod:421 +#: dos2unix.pod:442 msgid "B<-O, --to-stdout>" msgstr "" #. type: textblock -#: dos2unix.pod:423 +#: dos2unix.pod:444 msgid "" "Write to standard output, like a Unix filter. Use option C<-o> to go back to " "old file (in-place) mode." msgstr "" #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:447 msgid "" "Combined with option C<-e> files can be properly concatenated. No merged " "last and first lines, and no Unicode byte order marks in the middle of the " @@ -864,7 +916,7 @@ msgid "" msgstr "" #. type: verbatim -#: dos2unix.pod:430 +#: dos2unix.pod:451 #, no-wrap msgid "" " dos2unix -e -O file1.txt file2.txt > output.txt\n" @@ -872,19 +924,19 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:432 +#: dos2unix.pod:453 msgid "B<-o, --oldfile FILE ...>" msgstr "" #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:455 msgid "" "Old file mode. Convert file FILE and overwrite output to it. The program " "defaults to run in this mode. Wildcard names may be used." msgstr "" #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:458 msgid "" "In old file (in-place) mode the converted file gets the same owner, group, " "and read/write permissions as the original file. Also when the file is " @@ -898,14 +950,14 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:467 msgid "" "To check if dos2unix has support for preserving the user and group ownership " "of files type C." msgstr "" #. type: textblock -#: dos2unix.pod:449 +#: dos2unix.pod:470 msgid "" "Conversion is always done via a temporary file. When an error occurs halfway " "the conversion, the temporary file is deleted and the original file stays " @@ -918,7 +970,7 @@ msgid "" msgstr "" #. type: verbatim -#: dos2unix.pod:458 +#: dos2unix.pod:479 #, no-wrap msgid "" " dos2unix --allow-chown foo.txt\n" @@ -926,12 +978,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:460 +#: dos2unix.pod:481 msgid "Another option is to use new file mode:" msgstr "" #. type: verbatim -#: dos2unix.pod:462 +#: dos2unix.pod:483 #, no-wrap msgid "" " dos2unix -n foo.txt foo.txt\n" @@ -939,31 +991,31 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:485 msgid "" "The advantage of the C<--allow-chown> option is that you can use wildcards, " "and the ownership properties will be preserved when possible." msgstr "" #. type: =item -#: dos2unix.pod:467 +#: dos2unix.pod:488 msgid "B<-q, --quiet>" msgstr "" #. type: textblock -#: dos2unix.pod:469 +#: dos2unix.pod:490 msgid "" "Quiet mode. Suppress all warnings and messages. The return value is zero. " "Except when wrong command-line options are used." msgstr "" #. type: =item -#: dos2unix.pod:472 +#: dos2unix.pod:493 msgid "B<-r, --remove-bom>" msgstr "" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:495 msgid "" "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This " "is the default behavior when converting to Unix line breaks. See also " @@ -971,17 +1023,17 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:478 +#: dos2unix.pod:499 msgid "B<-s, --safe>" msgstr "" #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:501 msgid "Skip binary files (default)." msgstr "" #. type: textblock -#: dos2unix.pod:482 +#: dos2unix.pod:503 msgid "" "The skipping of binary files is done to avoid accidental mistakes. Be aware " "that the detection of binary files is not 100% foolproof. Input files are " @@ -991,12 +1043,12 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:488 +#: dos2unix.pod:509 msgid "B<-u, --keep-utf16>" msgstr "" #. type: textblock -#: dos2unix.pod:490 +#: dos2unix.pod:511 msgid "" "Keep the original UTF-16 encoding of the input file. The output file will be " "written in the same UTF-16 encoding, little or big endian, as the input " @@ -1005,24 +1057,24 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:495 +#: dos2unix.pod:516 msgid "B<-ul, --assume-utf16le>" msgstr "" #. type: textblock -#: dos2unix.pod:497 +#: dos2unix.pod:518 msgid "Assume that the input file format is UTF-16LE." msgstr "" #. type: textblock -#: dos2unix.pod:499 +#: dos2unix.pod:520 msgid "" "When there is a Byte Order Mark in the input file the BOM has priority over " "this option." msgstr "" #. type: textblock -#: dos2unix.pod:502 +#: dos2unix.pod:523 msgid "" "When you made a wrong assumption (the input file was not in UTF-16LE format) " "and the conversion succeeded, you will get an UTF-8 output file with wrong " @@ -1031,151 +1083,154 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:507 +#: dos2unix.pod:528 msgid "" "The assumption of UTF-16LE works as a I. By switching to " "the default I mode the UTF-16LE assumption is turned off." msgstr "" #. type: =item -#: dos2unix.pod:510 +#: dos2unix.pod:531 msgid "B<-ub, --assume-utf16be>" msgstr "" #. type: textblock -#: dos2unix.pod:512 +#: dos2unix.pod:533 msgid "Assume that the input file format is UTF-16BE." msgstr "" #. type: textblock -#: dos2unix.pod:514 +#: dos2unix.pod:535 msgid "This option works the same as option C<-ul>." msgstr "" #. type: =item -#: dos2unix.pod:516 +#: dos2unix.pod:537 msgid "B<-v, --verbose>" msgstr "" #. type: textblock -#: dos2unix.pod:518 +#: dos2unix.pod:539 msgid "" "Display verbose messages. Extra information is displayed about Byte Order " "Marks and the amount of converted line breaks." msgstr "" #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:542 msgid "B<-F, --follow-symlink>" msgstr "" #. type: textblock -#: dos2unix.pod:523 +#: dos2unix.pod:544 msgid "Follow symbolic links and convert the targets." msgstr "" #. type: =item -#: dos2unix.pod:525 +#: dos2unix.pod:546 msgid "B<-R, --replace-symlink>" msgstr "" #. type: textblock -#: dos2unix.pod:527 +#: dos2unix.pod:548 msgid "" "Replace symbolic links with converted files (original target files remain " "unchanged)." msgstr "" #. type: =item -#: dos2unix.pod:530 +#: dos2unix.pod:551 msgid "B<-S, --skip-symlink>" msgstr "" #. type: textblock -#: dos2unix.pod:532 +#: dos2unix.pod:553 msgid "Keep symbolic links and targets unchanged (default)." msgstr "" #. type: =item -#: dos2unix.pod:534 +#: dos2unix.pod:555 msgid "B<-V, --version>" msgstr "" #. type: textblock -#: dos2unix.pod:536 +#: dos2unix.pod:557 msgid "Display version information and exit." msgstr "" #. type: =head1 -#: dos2unix.pod:540 +#: dos2unix.pod:561 msgid "MAC MODE" msgstr "" #. type: textblock -#: dos2unix.pod:542 +#: dos2unix.pod:563 msgid "" -"In normal mode line breaks are converted from DOS to Unix and vice versa. " -"Mac line breaks are not converted." +"By default line breaks are converted from DOS to Unix and vice versa. Mac " +"line breaks are not converted." msgstr "" #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:566 msgid "" "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS " "line breaks are not changed." msgstr "" #. type: textblock -#: dos2unix.pod:548 +#: dos2unix.pod:569 msgid "" "To run in Mac mode use the command-line option C<-c mac> or use the commands " "C or C." msgstr "" #. type: =head1 -#: dos2unix.pod:551 +#: dos2unix.pod:572 msgid "CONVERSION MODES" msgstr "" #. type: =item -#: dos2unix.pod:555 +#: dos2unix.pod:576 msgid "B" msgstr "" #. type: textblock -#: dos2unix.pod:557 +#: dos2unix.pod:578 msgid "" -"In mode C only line breaks are converted. This is the default " -"conversion mode." +"This is the default conversion mode. This mode is for converting ASCII and " +"ASCII-compatible encoded files, like UTF-8. Enabling B mode disables " +"B<7bit> and B mode." msgstr "" #. type: textblock -#: dos2unix.pod:560 +#: dos2unix.pod:582 msgid "" -"Although the name of this mode is ASCII, which is a 7 bit standard, the " -"actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 " -"files." +"If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the " +"current locale character encoding on POSIX systems and to UTF-8 on Windows. " +"Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) " +"and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if " +"dos2unix has UTF-16 support type C. See also section UNICODE." msgstr "" #. type: =item -#: dos2unix.pod:564 +#: dos2unix.pod:588 msgid "B<7bit>" msgstr "" #. type: textblock -#: dos2unix.pod:566 +#: dos2unix.pod:590 msgid "" "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) " "are converted to a 7 bit space." msgstr "" #. type: =item -#: dos2unix.pod:569 +#: dos2unix.pod:593 msgid "B" msgstr "" #. type: textblock -#: dos2unix.pod:571 +#: dos2unix.pod:595 msgid "" "Characters are converted between a DOS character set (code page) and ISO " "character set ISO-8859-1 (Latin-1) on Unix. DOS characters without " @@ -1184,7 +1239,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:576 +#: dos2unix.pod:600 msgid "" "When only option C<-iso> is used dos2unix will try to determine the active " "code page. When this is not possible dos2unix will use default code page " @@ -1197,24 +1252,24 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:585 +#: dos2unix.pod:609 msgid "" "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 " "encoded files." msgstr "" #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:611 msgid "Some examples:" msgstr "" #. type: textblock -#: dos2unix.pod:589 +#: dos2unix.pod:613 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "" #. type: verbatim -#: dos2unix.pod:591 +#: dos2unix.pod:615 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -1222,12 +1277,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:593 +#: dos2unix.pod:617 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "" #. type: verbatim -#: dos2unix.pod:595 +#: dos2unix.pod:619 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -1235,12 +1290,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:597 +#: dos2unix.pod:621 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "" #. type: verbatim -#: dos2unix.pod:599 +#: dos2unix.pod:623 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -1248,12 +1303,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:601 +#: dos2unix.pod:625 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "" #. type: verbatim -#: dos2unix.pod:603 +#: dos2unix.pod:627 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -1261,12 +1316,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:605 +#: dos2unix.pod:629 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "" #. type: verbatim -#: dos2unix.pod:607 +#: dos2unix.pod:631 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -1274,12 +1329,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:609 +#: dos2unix.pod:633 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "" #. type: verbatim -#: dos2unix.pod:611 +#: dos2unix.pod:635 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1287,12 +1342,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:637 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "" #. type: verbatim -#: dos2unix.pod:615 +#: dos2unix.pod:639 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1300,12 +1355,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:617 +#: dos2unix.pod:641 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "" #. type: verbatim -#: dos2unix.pod:619 +#: dos2unix.pod:643 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1313,24 +1368,24 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:621 +#: dos2unix.pod:645 msgid "" "See also L and " "L." msgstr "" #. type: =head1 -#: dos2unix.pod:626 +#: dos2unix.pod:650 msgid "UNICODE" msgstr "" #. type: =head2 -#: dos2unix.pod:628 +#: dos2unix.pod:652 msgid "Encodings" msgstr "" #. type: textblock -#: dos2unix.pod:630 +#: dos2unix.pod:654 msgid "" "There exist different Unicode encodings. On Unix and Linux Unicode files are " "typically encoded in UTF-8 encoding. On Windows Unicode text files can be " @@ -1339,26 +1394,26 @@ msgid "" msgstr "" #. type: =head2 -#: dos2unix.pod:635 +#: dos2unix.pod:659 msgid "Conversion" msgstr "" #. type: textblock -#: dos2unix.pod:637 +#: dos2unix.pod:661 msgid "" -"Unicode text files can have DOS, Unix or Mac line breaks, like regular text " +"Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text " "files." msgstr "" #. type: textblock -#: dos2unix.pod:640 +#: dos2unix.pod:664 msgid "" "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, " "because UTF-8 was designed for backward compatibility with ASCII." msgstr "" #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:667 msgid "" "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big " "endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 " @@ -1366,7 +1421,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:671 msgid "" "On Unix/Linux UTF-16 encoded files are converted to the locale character " "encoding. Use the locale(1) command to find out what the locale character " @@ -1375,14 +1430,14 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:652 +#: dos2unix.pod:676 msgid "" "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted " "text files are well supported on both Windows and Unix/Linux." msgstr "" #. type: textblock -#: dos2unix.pod:655 +#: dos2unix.pod:679 msgid "" "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost " "in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for " @@ -1391,7 +1446,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:659 +#: dos2unix.pod:683 msgid "" "When option C<-u> is used, the output file will be written in the same " "UTF-16 encoding as the input file. Option C<-u> prevents conversion to " @@ -1399,37 +1454,37 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:662 +#: dos2unix.pod:686 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "" #. type: textblock -#: dos2unix.pod:664 +#: dos2unix.pod:688 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "" #. type: =head2 -#: dos2unix.pod:666 +#: dos2unix.pod:690 msgid "Byte Order Mark" msgstr "" #. type: textblock -#: dos2unix.pod:668 +#: dos2unix.pod:692 msgid "" "On Windows Unicode text files typically have a Byte Order Mark (BOM), " "because many Windows programs (including Notepad) add BOMs by default. See " -"also L." +"also L." msgstr "" #. type: textblock -#: dos2unix.pod:672 +#: dos2unix.pod:696 msgid "" "On Unix Unicode files typically don't have a BOM. It is assumed that text " "files are encoded in the locale character encoding." msgstr "" #. type: textblock -#: dos2unix.pod:675 +#: dos2unix.pod:699 msgid "" "Dos2unix can only detect if a file is in UTF-16 format if the file has a " "BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as " @@ -1437,36 +1492,36 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:679 +#: dos2unix.pod:703 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "" #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:705 msgid "" "Dos2unix writes by default no BOM in the output file. With option C<-b> " "Dos2unix writes a BOM when the input file has a BOM." msgstr "" #. type: textblock -#: dos2unix.pod:684 +#: dos2unix.pod:708 msgid "" "Unix2dos writes by default a BOM in the output file when the input file has " "a BOM. Use option C<-r> to remove the BOM." msgstr "" #. type: textblock -#: dos2unix.pod:687 +#: dos2unix.pod:711 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "" #. type: =head2 -#: dos2unix.pod:689 +#: dos2unix.pod:713 msgid "Unicode file names on Windows" msgstr "" #. type: textblock -#: dos2unix.pod:691 +#: dos2unix.pod:715 msgid "" "Dos2unix has optional support for reading and writing Unicode file names in " "the Windows Command Prompt. That means that dos2unix can open files that " @@ -1476,7 +1531,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:721 msgid "" "There are some issues with displaying Unicode file names in a Windows " "console. See option C<-D>, C<--display-enc>. The file names may be " @@ -1485,17 +1540,17 @@ msgid "" msgstr "" #. type: =head2 -#: dos2unix.pod:701 +#: dos2unix.pod:725 msgid "Unicode examples" msgstr "" #. type: textblock -#: dos2unix.pod:703 +#: dos2unix.pod:727 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "" #. type: verbatim -#: dos2unix.pod:705 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1503,12 +1558,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:731 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:733 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1516,12 +1571,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:735 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:737 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1529,12 +1584,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:739 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:741 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1542,20 +1597,20 @@ msgid "" msgstr "" #. type: =head1 -#: dos2unix.pod:719 +#: dos2unix.pod:743 msgid "GB18030" msgstr "" #. type: textblock -#: dos2unix.pod:721 +#: dos2unix.pod:745 msgid "" "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 " "standard is officially required for all software products sold in China. See " -"also L." +"also L." msgstr "" #. type: textblock -#: dos2unix.pod:725 +#: dos2unix.pod:749 msgid "" "GB18030 is fully compatible with Unicode, and can be considered an unicode " "transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 " @@ -1563,7 +1618,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:729 +#: dos2unix.pod:753 msgid "" "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding " "is set to GB18030. Note that this will only work if the locale is supported " @@ -1572,27 +1627,27 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:757 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "" #. type: textblock -#: dos2unix.pod:735 +#: dos2unix.pod:759 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "" #. type: =head1 -#: dos2unix.pod:737 +#: dos2unix.pod:761 msgid "EXAMPLES" msgstr "" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:763 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:765 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1601,12 +1656,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:744 +#: dos2unix.pod:768 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "" #. type: verbatim -#: dos2unix.pod:746 +#: dos2unix.pod:770 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1615,12 +1670,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:749 +#: dos2unix.pod:773 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "" #. type: verbatim -#: dos2unix.pod:751 +#: dos2unix.pod:775 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1628,14 +1683,14 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:753 +#: dos2unix.pod:777 msgid "" "Convert and replace a.txt in ascii conversion mode, convert and replace " "b.txt in 7bit conversion mode:" msgstr "" #. type: verbatim -#: dos2unix.pod:756 +#: dos2unix.pod:780 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1645,12 +1700,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:760 +#: dos2unix.pod:784 msgid "Convert a.txt from Mac to Unix format:" msgstr "" #. type: verbatim -#: dos2unix.pod:762 +#: dos2unix.pod:786 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1659,12 +1714,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:765 +#: dos2unix.pod:789 msgid "Convert a.txt from Unix to Mac format:" msgstr "" #. type: verbatim -#: dos2unix.pod:767 +#: dos2unix.pod:791 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1673,12 +1728,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:770 +#: dos2unix.pod:794 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "" #. type: verbatim -#: dos2unix.pod:772 +#: dos2unix.pod:796 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1687,12 +1742,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:775 +#: dos2unix.pod:799 msgid "Convert a.txt and write to e.txt:" msgstr "" #. type: verbatim -#: dos2unix.pod:777 +#: dos2unix.pod:801 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1700,12 +1755,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:779 +#: dos2unix.pod:803 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "" #. type: verbatim -#: dos2unix.pod:781 +#: dos2unix.pod:805 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1713,12 +1768,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:783 +#: dos2unix.pod:807 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "" #. type: verbatim -#: dos2unix.pod:785 +#: dos2unix.pod:809 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1727,14 +1782,14 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:788 +#: dos2unix.pod:812 msgid "" "Convert c.txt and write to e.txt, convert and replace a.txt, convert and " "replace b.txt, convert d.txt and write to f.txt:" msgstr "" #. type: verbatim -#: dos2unix.pod:791 +#: dos2unix.pod:815 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1742,12 +1797,12 @@ msgid "" msgstr "" #. type: =head1 -#: dos2unix.pod:793 +#: dos2unix.pod:817 msgid "RECURSIVE CONVERSION" msgstr "" #. type: textblock -#: dos2unix.pod:795 +#: dos2unix.pod:819 msgid "" "In a Unix shell the find(1) and xargs(1) commands can be used to run " "dos2unix recursively over all text files in a directory tree. For instance " @@ -1756,7 +1811,7 @@ msgid "" msgstr "" #. type: verbatim -#: dos2unix.pod:799 +#: dos2unix.pod:823 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1764,7 +1819,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:801 +#: dos2unix.pod:825 msgid "" "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are " "needed when there are files with spaces or quotes in the name. Otherwise " @@ -1773,7 +1828,7 @@ msgid "" msgstr "" #. type: verbatim -#: dos2unix.pod:805 +#: dos2unix.pod:829 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1781,12 +1836,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:807 +#: dos2unix.pod:831 msgid "In a Windows Command Prompt the following command can be used:" msgstr "" #. type: verbatim -#: dos2unix.pod:809 +#: dos2unix.pod:833 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1794,12 +1849,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:811 +#: dos2unix.pod:835 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "" #. type: verbatim -#: dos2unix.pod:813 +#: dos2unix.pod:837 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object " @@ -1808,17 +1863,17 @@ msgid "" msgstr "" #. type: =head1 -#: dos2unix.pod:816 +#: dos2unix.pod:840 msgid "LOCALIZATION" msgstr "" #. type: =item -#: dos2unix.pod:820 +#: dos2unix.pod:844 msgid "B" msgstr "" #. type: textblock -#: dos2unix.pod:822 +#: dos2unix.pod:846 msgid "" "The primary language is selected with the environment variable LANG. The " "LANG variable consists out of several parts. The first part is in small " @@ -1829,7 +1884,7 @@ msgid "" msgstr "" #. type: verbatim -#: dos2unix.pod:829 +#: dos2unix.pod:853 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1843,26 +1898,26 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:837 +#: dos2unix.pod:861 msgid "" "For a complete list of language and country codes see the gettext manual: " -"L" +"L" msgstr "" #. type: textblock -#: dos2unix.pod:840 +#: dos2unix.pod:864 msgid "" "On Unix systems you can use the command locale(1) to get locale specific " "information." msgstr "" #. type: =item -#: dos2unix.pod:843 +#: dos2unix.pod:867 msgid "B" msgstr "" #. type: textblock -#: dos2unix.pod:845 +#: dos2unix.pod:869 msgid "" "With the LANGUAGE environment variable you can specify a priority list of " "languages, separated by colons. Dos2unix gives preference to LANGUAGE over " @@ -1870,23 +1925,23 @@ msgid "" "have to first enable localization, by setting LANG (or LC_ALL) to a value " "other than \"C\", before you can use a language priority list through the " "LANGUAGE variable. See also the gettext manual: " -"L" +"L" msgstr "" #. type: textblock -#: dos2unix.pod:853 +#: dos2unix.pod:877 msgid "" "If you select a language which is not available you will get the standard " "English messages." msgstr "" #. type: =item -#: dos2unix.pod:857 +#: dos2unix.pod:881 msgid "B" msgstr "" #. type: textblock -#: dos2unix.pod:859 +#: dos2unix.pod:883 msgid "" "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during " "compilation can be overruled. LOCALEDIR is used to find the language " @@ -1895,12 +1950,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:864 +#: dos2unix.pod:888 msgid "Example (POSIX shell):" msgstr "" #. type: verbatim -#: dos2unix.pod:866 +#: dos2unix.pod:890 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1908,56 +1963,56 @@ msgid "" msgstr "" #. type: =head1 -#: dos2unix.pod:871 +#: dos2unix.pod:895 msgid "RETURN VALUE" msgstr "" #. type: textblock -#: dos2unix.pod:873 +#: dos2unix.pod:897 msgid "" "On success, zero is returned. When a system error occurs the last system " "error will be returned. For other errors 1 is returned." msgstr "" #. type: textblock -#: dos2unix.pod:876 +#: dos2unix.pod:900 msgid "" "The return value is always zero in quiet mode, except when wrong " "command-line options are used." msgstr "" #. type: =head1 -#: dos2unix.pod:879 +#: dos2unix.pod:903 msgid "STANDARDS" msgstr "" #. type: textblock -#: dos2unix.pod:881 -msgid "L" +#: dos2unix.pod:905 +msgid "L" msgstr "" #. type: textblock -#: dos2unix.pod:883 -msgid "L" +#: dos2unix.pod:907 +msgid "L" msgstr "" #. type: textblock -#: dos2unix.pod:885 -msgid "L" +#: dos2unix.pod:909 +msgid "L" msgstr "" #. type: textblock -#: dos2unix.pod:887 -msgid "L" +#: dos2unix.pod:911 +msgid "L" msgstr "" #. type: =head1 -#: dos2unix.pod:889 +#: dos2unix.pod:913 msgid "AUTHORS" msgstr "" #. type: textblock -#: dos2unix.pod:891 +#: dos2unix.pod:915 msgid "" "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix " "mode) - , Christian Wurll (add extra newline) - " @@ -1965,21 +2020,21 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:896 -msgid "Project page: L" +#: dos2unix.pod:920 +msgid "Project page: L" msgstr "" #. type: textblock -#: dos2unix.pod:898 -msgid "SourceForge page: L" +#: dos2unix.pod:922 +msgid "SourceForge page: L" msgstr "" #. type: =head1 -#: dos2unix.pod:900 +#: dos2unix.pod:924 msgid "SEE ALSO" msgstr "" #. type: textblock -#: dos2unix.pod:902 +#: dos2unix.pod:926 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "" diff --git a/dos2unix/po-man/es.po b/dos2unix/po-man/es.po index b80130f..2159c7d 100644 --- a/dos2unix/po-man/es.po +++ b/dos2unix/po-man/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix-man-7.2.1-beta1\n" -"POT-Creation-Date: 2023-04-20 22:32+0200\n" +"POT-Creation-Date: 2023-11-27 21:39+0100\n" "PO-Revision-Date: 2015-03-19 09:38+0100\n" "Last-Translator: Enrique Lazcorreta Puigmartí \n" "Language-Team: Spanish \n" @@ -149,8 +149,10 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:121 -msgid "Convert only line breaks. This is the default conversion mode." -msgstr "Sólo convierte los salto de línea. Éste es el modo de conversión por defecto." +#, fuzzy +#| msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES." +msgid "Default conversion mode. See also section CONVERSION MODES." +msgstr "Conversión entre el conjunto de caracteres DOS e ISO-8859-1. Véase también la sección MODOS DE CONVERSIÓN." #. type: =item #: dos2unix.pod:123 @@ -407,7 +409,7 @@ msgid "The following information is printed, in this order: number of DOS line b msgstr "Se muestra la siguiente información, en este orden: número de saltos de línea DOS, número de saltos de línea Unix, número de saltos de línea Mac, Marca de Orden de Byte, de texto o binario, nombre del archivo." #. type: textblock -#: dos2unix.pod:274 +#: dos2unix.pod:274 dos2unix.pod:290 msgid "Example output:" msgstr "Ejemplo de salida:" @@ -442,116 +444,166 @@ msgstr "" #. type: textblock #: dos2unix.pod:287 +msgid "If in addition option C<-e> or C<--add-eol> is used also the type of the line break of the last line is printed, or C if there is none." +msgstr "" + +#. type: verbatim +#: dos2unix.pod:292 +#, fuzzy, no-wrap +#| msgid "" +#| " 6 0 0 no_bom text dos.txt\n" +#| " 0 6 0 no_bom text unix.txt\n" +#| " 0 0 6 no_bom text mac.txt\n" +#| " 6 6 6 no_bom text mixed.txt\n" +#| " 50 0 0 UTF-16LE text utf16le.txt\n" +#| " 0 50 0 no_bom text utf8unix.txt\n" +#| " 50 0 0 UTF-8 text utf8dos.txt\n" +#| " 2 418 219 no_bom binary dos2unix.exe\n" +#| "\n" +msgid "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" +msgstr "" +" 6 0 0 no_bom text dos.txt\n" +" 0 6 0 no_bom text unix.txt\n" +" 0 0 6 no_bom text mac.txt\n" +" 6 6 6 no_bom text mixed.txt\n" +" 50 0 0 UTF-16LE text utf16le.txt\n" +" 0 50 0 no_bom text utf8unix.txt\n" +" 50 0 0 UTF-8 text utf8dos.txt\n" +" 2 418 219 no_bom binary dos2unix.exe\n" +"\n" + +#. type: textblock +#: dos2unix.pod:297 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Se pueden utilizar marcas extras opcionales para modificar la salida. Se pueden añadir una o más marcas." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:302 msgid "B<0>" msgstr "" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:304 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "" #. type: =item -#: dos2unix.pod:299 +#: dos2unix.pod:309 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:301 +#: dos2unix.pod:311 msgid "Print number of DOS line breaks." msgstr "Muestra el número de saltos de línea DOS." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:313 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:315 msgid "Print number of Unix line breaks." msgstr "Muestra el número de saltos de línea Unix." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:317 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:319 msgid "Print number of Mac line breaks." msgstr "Muestra el número de saltos de línea Mac." #. type: =item -#: dos2unix.pod:311 +#: dos2unix.pod:321 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:323 msgid "Print the byte order mark." msgstr "Muestra la Marca de Orden de Byte." #. type: =item -#: dos2unix.pod:315 +#: dos2unix.pod:325 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:317 +#: dos2unix.pod:327 msgid "Print if file is text or binary." msgstr "Muestra si el archivo es de texto o binario." #. type: =item -#: dos2unix.pod:319 +#: dos2unix.pod:329 +msgid "B" +msgstr "" + +#. type: textblock +#: dos2unix.pod:331 +msgid "Print the type of the line break of the last line, or C if there is none." +msgstr "" + +#. type: =item +#: dos2unix.pod:333 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:321 +#: dos2unix.pod:335 msgid "Print only the files that would be converted." msgstr "Muestra sólo los archivos que pueden ser convertidos." #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:337 msgid "With the C flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Con la marca C dos2unix sólo mostrará los archivos que contengan saltos de línea DOS, unix2dos sólo mostrará los nombres de archivo que tengan saltos de línea Unix." +#. type: textblock +#: dos2unix.pod:340 +msgid "If in addition option C<-e> or C<--add-eol> is used also the files that lack a line break on the last line will be printed." +msgstr "" + #. type: =item -#: dos2unix.pod:326 +#: dos2unix.pod:343 msgid "B" msgstr "" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:345 msgid "Print a header." msgstr "" #. type: =item -#: dos2unix.pod:330 +#: dos2unix.pod:347 msgid "B

" msgstr "" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:349 msgid "Show file names without path." msgstr "" #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:353 msgid "Examples:" msgstr "Ejemplos:" #. type: textblock -#: dos2unix.pod:338 +#: dos2unix.pod:355 msgid "Show information for all *.txt files:" msgstr "Muestra información para todos los archivos *.txt:" #. type: verbatim -#: dos2unix.pod:340 +#: dos2unix.pod:357 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -561,12 +613,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:342 +#: dos2unix.pod:359 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Muestra sólo el número de saltos de línea de DOS y de Unix:" #. type: verbatim -#: dos2unix.pod:344 +#: dos2unix.pod:361 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -576,12 +628,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:346 +#: dos2unix.pod:363 msgid "Show only the byte order mark:" msgstr "Muestra sólo la Marca de Orden de Byte." #. type: verbatim -#: dos2unix.pod:348 +#: dos2unix.pod:365 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -591,12 +643,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:350 +#: dos2unix.pod:367 msgid "List the files that have DOS line breaks:" msgstr "Muestra los archivos que tienen saltos de línea DOS:" #. type: verbatim -#: dos2unix.pod:352 +#: dos2unix.pod:369 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -606,12 +658,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:354 +#: dos2unix.pod:371 msgid "List the files that have Unix line breaks:" msgstr "Muestra los archivos que tienen saltos de línea Unix:" #. type: verbatim -#: dos2unix.pod:356 +#: dos2unix.pod:373 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -621,12 +673,32 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:358 +#: dos2unix.pod:375 +#, fuzzy +#| msgid "List the files that have DOS line breaks:" +msgid "List the files that have DOS line breaks or lack a line break on the last line:" +msgstr "Muestra los archivos que tienen saltos de línea DOS:" + +#. type: verbatim +#: dos2unix.pod:377 +#, fuzzy, no-wrap +#| msgid "" +#| " dos2unix -ic *.txt\n" +#| "\n" +msgid "" +" dos2unix -e -ic *.txt\n" +"\n" +msgstr "" +" dos2unix -ic *.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:379 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "" #. type: verbatim -#: dos2unix.pod:360 +#: dos2unix.pod:381 #, fuzzy, no-wrap #| msgid "" #| " find . -name *.txt |xargs dos2unix\n" @@ -639,14 +711,14 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:362 +#: dos2unix.pod:383 #, fuzzy #| msgid "List the files that have DOS line breaks:" msgid "Find text files that have DOS line breaks:" msgstr "Muestra los archivos que tienen saltos de línea DOS:" #. type: verbatim -#: dos2unix.pod:364 +#: dos2unix.pod:385 #, fuzzy, no-wrap #| msgid "" #| " find . -name *.txt |xargs dos2unix\n" @@ -659,126 +731,126 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:366 +#: dos2unix.pod:387 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:368 +#: dos2unix.pod:389 msgid "Keep the date stamp of output file same as input file." msgstr "Mantiene la fecha del archivo de salida igual a la del archivo de entrada." #. type: =item -#: dos2unix.pod:370 +#: dos2unix.pod:391 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:372 +#: dos2unix.pod:393 msgid "Display program's license." msgstr "Muestra la licencia del programa." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:395 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:397 msgid "Add additional newline." msgstr "Añade salto de línea adicional." #. type: textblock -#: dos2unix.pod:378 +#: dos2unix.pod:399 msgid "B: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B: Sólo los saltos de línea DOS son cambiados por dos saltos de línea Unix. En modo Mac sólo los saltos de línea Mac son cambiados por dos saltos de línea Unix." #. type: textblock -#: dos2unix.pod:382 +#: dos2unix.pod:403 msgid "B: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B: Sólo los saltos de línea Unix son cambiados por dos saltos de línea DOS. En modo Mac los saltos de línea Unix son cambiados por dos saltos de línea Mac." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:406 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:408 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "Escribe una Marca de Orden de Bytes (BOM) en el archivo de salida. Por defecto se escribe una BOM UTF-8." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:411 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "Cuando el archivo de entrada es UTF-16 y se usa la opción C<-u>, se escribirá un BOM UTF-16." #. type: textblock -#: dos2unix.pod:393 +#: dos2unix.pod:414 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "No utilice esta opción cuando la codificación de salida sea distinta de UTF-8, UTF-16 o GB18030. Véase también la sección UNICODE." #. type: =item -#: dos2unix.pod:397 +#: dos2unix.pod:418 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile ARCHIVO_DE_ENTRADA ARCHIVO_DE_SALIDA ...>" #. type: textblock -#: dos2unix.pod:399 +#: dos2unix.pod:420 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I be used or you I lose your files." msgstr "Modo de archivo nuevo. Convierte el archivo ARCHIVO_DE_ENTRADA y escribe la salida al archivo ARCHIVO_DE_SALIDA. Los nombres de archivo deben ser dados en pares y los comodines I deben ser usados o I sus archivos." #. type: textblock -#: dos2unix.pod:403 +#: dos2unix.pod:424 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "La persona que inicia la conversión en el modo de archivo nuevo (emparejado) será el propietario del archivo convertido. Los permisos de lectura/escritura del archivo nuevo serán los permisos del archivo original menos la umask(1) de la persona que ejecute la conversión." #. type: =item -#: dos2unix.pod:408 +#: dos2unix.pod:429 msgid "B<--no-allow-chown>" msgstr "" #. type: textblock -#: dos2unix.pod:410 +#: dos2unix.pod:431 msgid "Don't allow file ownership change in old file mode (default)." msgstr "" #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:433 msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." msgstr "" #. type: =item -#: dos2unix.pod:417 +#: dos2unix.pod:438 #, fuzzy #| msgid "B<-m, --add-bom>" msgid "B<--no-add-eol>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:419 +#: dos2unix.pod:440 msgid "Do not add a line break to the last line if there isn't one." msgstr "" #. type: =item -#: dos2unix.pod:421 +#: dos2unix.pod:442 #, fuzzy #| msgid "B<-q, --quiet>" msgid "B<-O, --to-stdout>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:423 +#: dos2unix.pod:444 msgid "Write to standard output, like a Unix filter. Use option C<-o> to go back to old file (in-place) mode." msgstr "" #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:447 msgid "Combined with option C<-e> files can be properly concatenated. No merged last and first lines, and no Unicode byte order marks in the middle of the concatenated file. Example:" msgstr "" #. type: verbatim -#: dos2unix.pod:430 +#: dos2unix.pod:451 #, fuzzy, no-wrap #| msgid "" #| " dos2unix -ul -n in.txt out.txt\n" @@ -791,34 +863,34 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:432 +#: dos2unix.pod:453 #, fuzzy #| msgid "B<-o, --oldfile FILE ...>" msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile ARCHIVO ...>" #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:455 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "Modo de archivo antiguo. Convierte el archivo ARCHIVO y lo sobrescribe con la salida. El programa por defecto se ejecuta en este modo. Se pueden emplear comodines." #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:458 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "En modo de archivo antiguo (in situ), el archivo convertido tiene el mismo propietario, grupo y permisos de lectura/escritura que el archivo original. Lo mismo aplica cuando el archivo es convertido por otro usuario que tiene permiso de lectura en el archivo (p.e. usuario root). La conversión será abortada cuando no sea posible preservar los valores originales. Cambiar el propietario implicaría que el propietario original ya no podrá leer el archivo. Cambiar el grupo podría ser un riesgo de seguridad, ya que el archivo podría ser accesible a personas inadecuadas. La preservación del propietario, grupo, y permisos de lectura/escritura sólo está soportada bajo Unix." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:467 msgid "To check if dos2unix has support for preserving the user and group ownership of files type C." msgstr "" #. type: textblock -#: dos2unix.pod:449 +#: dos2unix.pod:470 msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" msgstr "" #. type: verbatim -#: dos2unix.pod:458 +#: dos2unix.pod:479 #, fuzzy, no-wrap #| msgid "" #| " dos2unix -n -- -foo out.txt\n" @@ -831,14 +903,14 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:460 +#: dos2unix.pod:481 #, fuzzy #| msgid "Or in new file mode:" msgid "Another option is to use new file mode:" msgstr "O en modo de archivo nuevo:" #. type: verbatim -#: dos2unix.pod:462 +#: dos2unix.pod:483 #, fuzzy, no-wrap #| msgid "" #| " dos2unix -n a.txt e.txt\n" @@ -851,227 +923,229 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:485 msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." msgstr "" #. type: =item -#: dos2unix.pod:467 +#: dos2unix.pod:488 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:469 +#: dos2unix.pod:490 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Modo silencioso. Suprime todas las advertencias y mensajes. El valor retornado es cero. Excepto cuando se emplean parámetros incorrectos." #. type: =item -#: dos2unix.pod:472 +#: dos2unix.pod:493 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:495 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "Elimina la Marca de Orden de Byte (BOM). No escribe el BOM en el archivo de salida. Este es el comportamiento por defecto al convertir a saltos de línea Unix. Vea también la opción C<-b>." #. type: =item -#: dos2unix.pod:478 +#: dos2unix.pod:499 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:501 msgid "Skip binary files (default)." msgstr "Ignora los archivos binarios (por defecto)." #. type: textblock -#: dos2unix.pod:482 +#: dos2unix.pod:503 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "" #. type: =item -#: dos2unix.pod:488 +#: dos2unix.pod:509 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:490 +#: dos2unix.pod:511 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "Mantiene la codificación original UTF-16 en el archivo de entrada. El archivo de salida se escribirá con la misma codificación UTF-16, little o big endian, como el archivo de entrada. Esto impide la transformación a UTF-8. En consecuencia se escribirá un BOM UTF-16. Esta opción se puede desactivar con la opción C<-ascii>." #. type: =item -#: dos2unix.pod:495 +#: dos2unix.pod:516 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:497 +#: dos2unix.pod:518 msgid "Assume that the input file format is UTF-16LE." msgstr "Se asume que el formato de archivo de entrada es UTF-16LE." #. type: textblock -#: dos2unix.pod:499 +#: dos2unix.pod:520 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "Cuando existe una Marca de Orden de Bytes (BOM) en el archivo de entrada, la BOM tiene prioridad sobre esta opción." #. type: textblock -#: dos2unix.pod:502 +#: dos2unix.pod:523 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "Cuando se hace una suposición incorrecta (el archivo de entrada no estaba en formato UTF-16LE) y la conversión tiene éxito, obtendrá un archivo UTF-8 de salida con el texto erróneo. La conversión errónea puede deshacerse con iconv(1) convirtiendo el archivo UTF-8 de salida de vuelta a UTF-16LE. Esto restaurará el archivo original." #. type: textblock -#: dos2unix.pod:507 +#: dos2unix.pod:528 msgid "The assumption of UTF-16LE works as a I. By switching to the default I mode the UTF-16LE assumption is turned off." msgstr "El supuesto de UTF-16LE funciona como un I. Al cambiar al modo por defecto I el supuesto UTF-16LE es deshabilitado." #. type: =item -#: dos2unix.pod:510 +#: dos2unix.pod:531 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:512 +#: dos2unix.pod:533 msgid "Assume that the input file format is UTF-16BE." msgstr "Se asume que el formato del archivo de entrada es UTF-16BE." #. type: textblock -#: dos2unix.pod:514 +#: dos2unix.pod:535 msgid "This option works the same as option C<-ul>." msgstr "Esta opción funciona igual que la opción C<-ul>." #. type: =item -#: dos2unix.pod:516 +#: dos2unix.pod:537 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:518 +#: dos2unix.pod:539 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "Mostrar mensajes detallados. Se muestra información extra acerca de Marcas de Orden de Bytes (BOM) y el número de saltos de línea convertidos." #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:542 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:523 +#: dos2unix.pod:544 msgid "Follow symbolic links and convert the targets." msgstr "Sigue los enlaces simbólicos y convierte los destinos." #. type: =item -#: dos2unix.pod:525 +#: dos2unix.pod:546 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:527 +#: dos2unix.pod:548 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "Reemplaza los enlaces simbólicos con los archivos convertidos (los archivos destino originales no se alteran)." #. type: =item -#: dos2unix.pod:530 +#: dos2unix.pod:551 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:532 +#: dos2unix.pod:553 msgid "Keep symbolic links and targets unchanged (default)." msgstr "No altera los enlaces simbólicos ni sus destinos (por defecto)." #. type: =item -#: dos2unix.pod:534 +#: dos2unix.pod:555 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:536 +#: dos2unix.pod:557 msgid "Display version information and exit." msgstr "Despiega la información de la versión y termina el programa." #. type: =head1 -#: dos2unix.pod:540 +#: dos2unix.pod:561 msgid "MAC MODE" msgstr "MODO MAC" #. type: textblock -#: dos2unix.pod:542 -msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." +#: dos2unix.pod:563 +#, fuzzy +#| msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." +msgid "By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." msgstr "En modo normal los saltos de línea son convertidos de DOS a Unix y viceversa. Los saltos de línea Mac no son convertidos." #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:566 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "En modo Mac los saltos de línea son convertidos de Mac a Unix y viceversa. Los saltos de línea DOS no son modificados." #. type: textblock -#: dos2unix.pod:548 +#: dos2unix.pod:569 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C or C." msgstr "Para ejecutar en modo Mac use el modificador C<-c mac> o use los comandos C o C." #. type: =head1 -#: dos2unix.pod:551 +#: dos2unix.pod:572 msgid "CONVERSION MODES" msgstr "MODOS DE CONVERSIÓN" #. type: =item -#: dos2unix.pod:555 +#: dos2unix.pod:576 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:557 -msgid "In mode C only line breaks are converted. This is the default conversion mode." -msgstr "En modo C sólo los saltos de línea son convertidos. Éste es el modo de conversión por defecto." +#: dos2unix.pod:578 +msgid "This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling B mode disables B<7bit> and B mode." +msgstr "" #. type: textblock -#: dos2unix.pod:560 -msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." -msgstr "Aunque el nombre de este modo es ASCII, que es un estándar de 7 bits, éste emplea 8 bits. Siempre use este modo cuando convierta archivos Unicode UTF-8." +#: dos2unix.pod:582 +msgid "If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has UTF-16 support type C. See also section UNICODE." +msgstr "" #. type: =item -#: dos2unix.pod:564 +#: dos2unix.pod:588 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:566 +#: dos2unix.pod:590 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "En este modo todos los caracteres no ASCII de 8 bits (con valores de 128 a 255) son convertidos al espacio de 7 bits." #. type: =item -#: dos2unix.pod:569 +#: dos2unix.pod:593 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:571 +#: dos2unix.pod:595 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Los caracteres son convertidos entre un conjunto de caracteres DOS (página de códigos) y el conjunto de caracteres ISO-8859-1 (Latín-1) de Unix. Los caracteres DOS sin equivalente ISO-8859-1, para los cuales la conversión es imposible, son convertidos en un punto. Lo mismo se aplica para caracteres ISO-8859-1 sin contraparte DOS." #. type: textblock -#: dos2unix.pod:576 +#: dos2unix.pod:600 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "Cuando sólo se emplea el parámetro C<-iso>, dos2unix intentará determinar la página de códigos activa. Cuando esto no sea posible, dos2unix utilizará la página de códigos 437 por defecto, la cual es empleada principalmente en EE. UU. Para forzar una página de códigos específica emplee los parámetros C<-437> (EE. UU.), C<-850> (Europa Occidental), C<-860> (Portugués), C<-863> (Francocanadiense), o C<-865> (Nórdico). La página de códigos Windows 1252 (Europa Occidental) también está soportada con el parámetro C<-1252>. Para acceder a otras páginas de códigos use dos2unix en combinación con iconv(1). Iconv puede convertir entre una larga lista de codificaciones de caracteres." #. type: textblock -#: dos2unix.pod:585 +#: dos2unix.pod:609 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "No use la conversión ISO en archivos de texto Unicode. Esto corrompería los archivos codificados como UTF-8." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:611 msgid "Some examples:" msgstr "Algunos ejemplos:" #. type: textblock -#: dos2unix.pod:589 +#: dos2unix.pod:613 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Convierte de la página de códigos por defecto de DOS a Latín-1 de Unix:" #. type: verbatim -#: dos2unix.pod:591 +#: dos2unix.pod:615 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -1081,12 +1155,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:593 +#: dos2unix.pod:617 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Convierte de DOS CP850 a Unix Latín-1:" #. type: verbatim -#: dos2unix.pod:595 +#: dos2unix.pod:619 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -1096,12 +1170,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:597 +#: dos2unix.pod:621 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Convierte de Windows CP1252 a Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:599 +#: dos2unix.pod:623 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -1111,12 +1185,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:601 +#: dos2unix.pod:625 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Convierte de Windows CP1252 a Unix UTF-8 (Unicode)." #. type: verbatim -#: dos2unix.pod:603 +#: dos2unix.pod:627 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -1126,12 +1200,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:605 +#: dos2unix.pod:629 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Convierte de Unix Latin-1 a la página de códigos por defecto de DOS:" #. type: verbatim -#: dos2unix.pod:607 +#: dos2unix.pod:631 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -1141,12 +1215,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:609 +#: dos2unix.pod:633 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Convierte de Unix Latin-1 a DOS CP850:" #. type: verbatim -#: dos2unix.pod:611 +#: dos2unix.pod:635 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1156,12 +1230,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:637 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Convierte de Unix Latin-1 a Windows CP1252." #. type: verbatim -#: dos2unix.pod:615 +#: dos2unix.pod:639 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1171,12 +1245,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:617 +#: dos2unix.pod:641 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Convierte de Unix UTF-8 (Unicode) a Windows CP1252:" #. type: verbatim -#: dos2unix.pod:619 +#: dos2unix.pod:643 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1186,142 +1260,146 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:621 +#: dos2unix.pod:645 msgid "See also L and L." msgstr "Véase también L y L." #. type: =head1 -#: dos2unix.pod:626 +#: dos2unix.pod:650 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:628 +#: dos2unix.pod:652 msgid "Encodings" msgstr "Codificaciones" #. type: textblock -#: dos2unix.pod:630 +#: dos2unix.pod:654 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Existen diferentes codificaciones Unicode. En Unix y Linux los archivos Unicode son codificados comúnmente en UTF-8. En Windows los archivos de texto Unicode pueden estar codificados en UTF-8, UTF-16, o UTF-16 big endian, pero en general son codificados en formato UTF-16." #. type: =head2 -#: dos2unix.pod:635 +#: dos2unix.pod:659 msgid "Conversion" msgstr "Conversion" #. type: textblock -#: dos2unix.pod:637 -msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." +#: dos2unix.pod:661 +#, fuzzy +#| msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." +msgid "Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files." msgstr "Los archivos de texto Unicode pueden tener saltos de línea DOS, Unix o Mac, como cualquier archivo de texto." #. type: textblock -#: dos2unix.pod:640 +#: dos2unix.pod:664 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Todas las versiones de dos2unix y unix2dos pueden convertir archivos codificados como UTF-8, debido a que UTF-8 fue diseñado para retro-compatibilidad con ASCII." #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:667 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C." msgstr "Dos2unix y unix2dos con soporte Unicode UTF-16, pueden leer archivos de texto codificados como UTF-16 little y big endian. Para ver si dos2unix fue compilado con soporte UTF-16 escriba C." #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:671 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "En Unix/Linux los archivos codificados con UTF-16 se convierten a la codificación de caracteres local. Use el comando locale(1) para averiguar la codificación de caracteres local. Cuando no se puede hacer la conversión se obtendrá un error de conversión y se omitirá el archivo." #. type: textblock -#: dos2unix.pod:652 +#: dos2unix.pod:676 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "En Windows los archivos UTF-16 se convierten por defecto a UTF-8. Los archivos de texto forrajeados con UTF-8 están soportados tanto en Windows como en Unix/Linux." #. type: textblock -#: dos2unix.pod:655 +#: dos2unix.pod:679 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "Las codificaciones UTF-16 y UTF-8 son totalmente compatibles, no se perderá ningún texto en la conversión. Cuando ocurre un error de conversión de UTF-16 a UTF-8, por ejemplo cuando el archivo de entrada UTF-16 contiene un error, se omitirá el archivo." #. type: textblock -#: dos2unix.pod:659 +#: dos2unix.pod:683 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "Cuando se usa la opción C<-u>, el archivo de salida se escribirá en la misma codificación UTF-16 que el archivo de entrada. La opción C<-u> previene la conversión a UTF-8." #. type: textblock -#: dos2unix.pod:662 +#: dos2unix.pod:686 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "Dos2unix y unix2dos no tienen la opción de convertir archivos UTF-8 a UTF-16." #. type: textblock -#: dos2unix.pod:664 +#: dos2unix.pod:688 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "La conversión en modos ISO y 7-bit no funciona en archivos UTF-16." #. type: =head2 -#: dos2unix.pod:666 +#: dos2unix.pod:690 msgid "Byte Order Mark" msgstr "Marca de orden de bytes" #. type: textblock -#: dos2unix.pod:668 -msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." +#: dos2unix.pod:692 +#, fuzzy +#| msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." +msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." msgstr "En Windows los archivos de texto Unicode típicamente tienen una Marca de Orden de Bytes (BOM), debido a que muchos programas de Windows (incluyendo el Bloc de Notas) añaden una BOM por defecto. Véase también L." #. type: textblock -#: dos2unix.pod:672 +#: dos2unix.pod:696 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "En Unix los archivos Unicode no suelen tener BOM. Se supone que los archivos de texto son codificados en la codificación local de caracteres." #. type: textblock -#: dos2unix.pod:675 +#: dos2unix.pod:699 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "Dos2unix sólo puede detectar si un archivo está en formato UTF-16 si el archivo tiene una BOM. Cuando un archivo UTF-16 no tiene una BOM, dos2unix tratará el archivo como un archivo binario." #. type: textblock -#: dos2unix.pod:679 +#: dos2unix.pod:703 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Use la opción C<-ul> o C<-ub> para convertir un archivo UTF-16 sin BOM." #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:705 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "Dos2Unix, por defecto, no escribe BOM en el archivo de salida. Con la opción C<-b> Dos2unix escribe el BOM cuando el archivo de entrada tiene BOM." #. type: textblock -#: dos2unix.pod:684 +#: dos2unix.pod:708 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "Unix2dos escribe BOM en el archivo de salida cuando el archivo de entrada tiene BOM. Use la opción C<-r> para eliminar la BOM." #. type: textblock -#: dos2unix.pod:687 +#: dos2unix.pod:711 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "Dos2unix y unix2dos escriben siempre BOM cuando se usa la opción C<-m>." #. type: =head2 -#: dos2unix.pod:689 +#: dos2unix.pod:713 msgid "Unicode file names on Windows" msgstr "" #. type: textblock -#: dos2unix.pod:691 +#: dos2unix.pod:715 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C." msgstr "" #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:721 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "" #. type: =head2 -#: dos2unix.pod:701 +#: dos2unix.pod:725 msgid "Unicode examples" msgstr "Ejemplos Unicode" #. type: textblock -#: dos2unix.pod:703 +#: dos2unix.pod:727 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Convertir de Windows UTF-16 (con una BOM) a Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:705 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1331,12 +1409,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:731 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Convertir de Windows UTF-16LE (sin una BOM) a Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:733 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1346,12 +1424,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:735 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Convertir de Unix UTF-8 a Windows UTF-8 sin una BOM:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:737 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1361,12 +1439,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:739 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Convertir de Unix UTF-8 a Windows UTF-16:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:741 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1376,47 +1454,49 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:719 +#: dos2unix.pod:743 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:721 -msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." +#: dos2unix.pod:745 +#, fuzzy +#| msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." +msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." msgstr "GB18030 es un estándar del gobierno chino. Todo producto software vendido en China está obligado por ley a contener un subconjunto del GB18030 estándar. Véase L." #. type: textblock -#: dos2unix.pod:725 +#: dos2unix.pod:749 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "GB18030 es totalmente compatible con Unicode y puede considerarse como formato de transformación Unicode. Como ocurre con UTF-8, GB18030 es compatible con ASCII. GB18030 también es compatible con la página de códigos de Windows 936, también conocida como GBK." #. type: textblock -#: dos2unix.pod:729 +#: dos2unix.pod:753 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C to get the list of supported locales." msgstr "En Unix/Linux los archivos UTF-16 se convierten a GB18030 cuando la codificación local se establece en GB18030. Tenga en cuenta que esto sólo funcionará si la configuración local es soportada por el sistema. Utilice C para obtener el listado de configuraciones regionales admitidas." #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:757 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "Use la opción C<-ul> o C<-ub> para convertir un archivo UTF-16 sin BOM." #. type: textblock -#: dos2unix.pod:735 +#: dos2unix.pod:759 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "Los archivos codificados como GB18030 pueden tener una Marca de Orden de Bytes, como ocurre con los archivos Unicode." #. type: =head1 -#: dos2unix.pod:737 +#: dos2unix.pod:761 msgid "EXAMPLES" msgstr "EJEMPLOS" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:763 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Lee la entrada desde 'stdin' y escribe la salida a 'stdout':" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:765 #, fuzzy, no-wrap #| msgid "" #| " dos2unix -k a.txt\n" @@ -1432,12 +1512,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:744 +#: dos2unix.pod:768 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "Convierte y reemplaza a.txt. Convierte y reemplaza b.txt:" #. type: verbatim -#: dos2unix.pod:746 +#: dos2unix.pod:770 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1449,12 +1529,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:749 +#: dos2unix.pod:773 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "Convierte y reemplaza a.txt empleando modo de conversión ascii:" #. type: verbatim -#: dos2unix.pod:751 +#: dos2unix.pod:775 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1464,12 +1544,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:753 +#: dos2unix.pod:777 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "Convierte y reemplaza a.txt empleando modo de conversión ascii, convierte y reemplaza b.txt empleando modo de conversión de 7bits:" #. type: verbatim -#: dos2unix.pod:756 +#: dos2unix.pod:780 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1483,12 +1563,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:760 +#: dos2unix.pod:784 msgid "Convert a.txt from Mac to Unix format:" msgstr "Convierte a.txt del formato de Mac a Unix:" #. type: verbatim -#: dos2unix.pod:762 +#: dos2unix.pod:786 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1500,12 +1580,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:765 +#: dos2unix.pod:789 msgid "Convert a.txt from Unix to Mac format:" msgstr "Convierte a.txt del formato de Unix a Mac:" #. type: verbatim -#: dos2unix.pod:767 +#: dos2unix.pod:791 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1517,12 +1597,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:770 +#: dos2unix.pod:794 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "Convierte y reemplaza a.txt manteniendo la fecha del archivo original:" #. type: verbatim -#: dos2unix.pod:772 +#: dos2unix.pod:796 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1534,12 +1614,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:775 +#: dos2unix.pod:799 msgid "Convert a.txt and write to e.txt:" msgstr "Convierte a.txt y escribe la salida en e.txt:" #. type: verbatim -#: dos2unix.pod:777 +#: dos2unix.pod:801 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1549,12 +1629,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:779 +#: dos2unix.pod:803 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "Convierte a.txt y escribe la salida en e.txt, manteniendo la fecha de e.txt igual a la de a.txt:" #. type: verbatim -#: dos2unix.pod:781 +#: dos2unix.pod:805 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1564,12 +1644,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:783 +#: dos2unix.pod:807 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "Convierte y reemplaza a.txt, convierte b.txt y escribe en e.txt:" #. type: verbatim -#: dos2unix.pod:785 +#: dos2unix.pod:809 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1581,12 +1661,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:788 +#: dos2unix.pod:812 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "Convierte c.txt y escribe en e.txt, convierte y reemplaza a.txt, convierte y reemplaza b.txt, convierte d.txt y escribe en f.txt:" #. type: verbatim -#: dos2unix.pod:791 +#: dos2unix.pod:815 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1596,19 +1676,19 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:793 +#: dos2unix.pod:817 msgid "RECURSIVE CONVERSION" msgstr "CONVERSIÓN RECURSIVA" #. type: textblock -#: dos2unix.pod:795 +#: dos2unix.pod:819 #, fuzzy #| msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:" msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "Use dos2unix en combinación con los comandos find(1) y xargs(1) para convertir recursivamente archivos de texto contenidos en un árbol de directorios. Por ejemplo para convertir todos los archivos .txt en el árbol de directorios debajo del directorio actual escriba:" #. type: verbatim -#: dos2unix.pod:799 +#: dos2unix.pod:823 #, fuzzy, no-wrap #| msgid "" #| " find . -name *.txt |xargs dos2unix\n" @@ -1621,12 +1701,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:801 +#: dos2unix.pod:825 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "" #. type: verbatim -#: dos2unix.pod:805 +#: dos2unix.pod:829 #, fuzzy, no-wrap #| msgid "" #| " find . -name *.txt |xargs dos2unix\n" @@ -1639,12 +1719,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:807 +#: dos2unix.pod:831 msgid "In a Windows Command Prompt the following command can be used:" msgstr "" #. type: verbatim -#: dos2unix.pod:809 +#: dos2unix.pod:833 #, fuzzy, no-wrap #| msgid "" #| " find . -name *.txt |xargs dos2unix\n" @@ -1657,12 +1737,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:811 +#: dos2unix.pod:835 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "" #. type: verbatim -#: dos2unix.pod:813 +#: dos2unix.pod:837 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1670,22 +1750,22 @@ msgid "" msgstr "" #. type: =head1 -#: dos2unix.pod:816 +#: dos2unix.pod:840 msgid "LOCALIZATION" msgstr "INTERNACIONALIZACIÓN" #. type: =item -#: dos2unix.pod:820 +#: dos2unix.pod:844 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:822 +#: dos2unix.pod:846 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "El idioma principal se selecciona con la variable de entorno LANG. La variable LANG consiste de varias partes. La primer parte es el código del idioma en minúsculas. La segunda es opcional y es el código del país en mayúsculas, precedido por un guión bajo. Existe también una tercera parte opcional: la codificación de caracteres, precedida por un punto. Unos cuantos ejemplos para intérpretes de comandos tipo POSIX estándar:" #. type: verbatim -#: dos2unix.pod:829 +#: dos2unix.pod:853 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1707,47 +1787,51 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:837 -msgid "For a complete list of language and country codes see the gettext manual: L" +#: dos2unix.pod:861 +#, fuzzy +#| msgid "For a complete list of language and country codes see the gettext manual: L" +msgid "For a complete list of language and country codes see the gettext manual: L" msgstr "Para obtener una lista completa de códigos de idioma y país véase el manual de gettext: L" #. type: textblock -#: dos2unix.pod:840 +#: dos2unix.pod:864 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "En sistemas Unix puede emplear el comando locale(1) para obtener información específica de locale." #. type: =item -#: dos2unix.pod:843 +#: dos2unix.pod:867 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:845 -msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" +#: dos2unix.pod:869 +#, fuzzy +#| msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" +msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" msgstr "Con la variable de entorno LANGUAGE puede especificar una lista de prioridad de los idiomas, separados por dos puntos. Dos2unix da preferencia a LANGUAGE sobre LANG. Por ejemplo, primero neerlandés y entonces alemán: C. Para usar una lista de prioridad de idiomas a través de la variable LANGUAGE tiene que habilitar antes la internacionalización, asignando un valor distinto de \"C\" a LANG (o LC_ALL). Véase también el manual de gettext: L" #. type: textblock -#: dos2unix.pod:853 +#: dos2unix.pod:877 msgid "If you select a language which is not available you will get the standard English messages." msgstr "Si selecciona un idioma que no está disponible el programa funcionará en ingles." #. type: =item -#: dos2unix.pod:857 +#: dos2unix.pod:881 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:859 +#: dos2unix.pod:883 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C. Option B<--version> will display the LOCALEDIR that is used." msgstr "Con la variable de entorno DOS2UNIX_LOCALEDIR el LOCALEDIR asignado durante la compilación puede ser modificado. LOCALEDIR es usado para encontrar los archivos de idioma. El valor por defecto de GNU es C. El parámetro B<--version> mostrará el LOCALEDIR en uso." #. type: textblock -#: dos2unix.pod:864 +#: dos2unix.pod:888 msgid "Example (POSIX shell):" msgstr "Ejemplo (intérprete de comandos POSIX):" #. type: verbatim -#: dos2unix.pod:866 +#: dos2unix.pod:890 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1757,75 +1841,98 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:871 +#: dos2unix.pod:895 msgid "RETURN VALUE" msgstr "VALOR DE RETORNO" #. type: textblock -#: dos2unix.pod:873 +#: dos2unix.pod:897 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "Se regresa cero cuando el programa termina exitosamente. Cuando ocurre un error del sistema se regresará el último número de error del sistema. Para otros errores se regresa 1." #. type: textblock -#: dos2unix.pod:876 +#: dos2unix.pod:900 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "El valor de retorno es siempre cero en modo silencioso, excepto cuando se emplean parámetros incorrectos." #. type: =head1 -#: dos2unix.pod:879 +#: dos2unix.pod:903 msgid "STANDARDS" msgstr "ESTÁNDARES" #. type: textblock -#: dos2unix.pod:881 -msgid "L" +#: dos2unix.pod:905 +#, fuzzy +#| msgid "L" +msgid "L" msgstr "L" #. type: textblock -#: dos2unix.pod:883 -msgid "L" +#: dos2unix.pod:907 +#, fuzzy +#| msgid "L" +msgid "L" msgstr "L" #. type: textblock -#: dos2unix.pod:885 -msgid "L" +#: dos2unix.pod:909 +#, fuzzy +#| msgid "L" +msgid "L" msgstr "L" #. type: textblock -#: dos2unix.pod:887 -msgid "L" +#: dos2unix.pod:911 +#, fuzzy +#| msgid "L" +msgid "L" msgstr "L" #. type: =head1 -#: dos2unix.pod:889 +#: dos2unix.pod:913 msgid "AUTHORS" msgstr "AUTORES" #. type: textblock -#: dos2unix.pod:891 +#: dos2unix.pod:915 msgid "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer)" msgstr "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer)" #. type: textblock -#: dos2unix.pod:896 -msgid "Project page: L" +#: dos2unix.pod:920 +#, fuzzy +#| msgid "Project page: L" +msgid "Project page: L" msgstr "Página del proyecto: L" #. type: textblock -#: dos2unix.pod:898 -msgid "SourceForge page: L" +#: dos2unix.pod:922 +#, fuzzy +#| msgid "SourceForge page: L" +msgid "SourceForge page: L" msgstr "Página de SourceForge: L" #. type: =head1 -#: dos2unix.pod:900 +#: dos2unix.pod:924 msgid "SEE ALSO" msgstr "VÉASE TAMBIÉN" #. type: textblock -#: dos2unix.pod:902 +#: dos2unix.pod:926 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" +#, fuzzy +#~| msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." +#~ msgid "Although the name of this mode is B, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." +#~ msgstr "Aunque el nombre de este modo es ASCII, que es un estándar de 7 bits, éste emplea 8 bits. Siempre use este modo cuando convierta archivos Unicode UTF-8." + +#~ msgid "Convert only line breaks. This is the default conversion mode." +#~ msgstr "Sólo convierte los salto de línea. Éste es el modo de conversión por defecto." + +#~ msgid "In mode C only line breaks are converted. This is the default conversion mode." +#~ msgstr "En modo C sólo los saltos de línea son convertidos. Éste es el modo de conversión por defecto." + #, fuzzy #~| msgid "" #~| " find . -name *.txt |xargs dos2unix\n" diff --git a/dos2unix/po-man/fr.po b/dos2unix/po-man/fr.po index 23c9700..b3cca30 100644 --- a/dos2unix/po-man/fr.po +++ b/dos2unix/po-man/fr.po @@ -4,9 +4,9 @@ # Frédéric Marchal , 2023. msgid "" msgstr "" -"Project-Id-Version: dos2unix-man-7.5.0-beta5\n" -"POT-Creation-Date: 2023-04-23 10:34+0200\n" -"PO-Revision-Date: 2023-04-26 17:51+0200\n" +"Project-Id-Version: dos2unix-man-7.5.2-beta3\n" +"POT-Creation-Date: 2023-11-27 22:01+0100\n" +"PO-Revision-Date: 2023-11-29 19:07+0100\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" "Language: fr\n" @@ -145,8 +145,8 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:121 -msgid "Convert only line breaks. This is the default conversion mode." -msgstr "Convertit uniquement les sauts de lignes. C'est le mode de conversion par défaut." +msgid "Default conversion mode. See also section CONVERSION MODES." +msgstr "Mode de conversion par défaut. Voyez aussi la section des MODES DE CONVERSION." #. type: =item #: dos2unix.pod:123 @@ -399,7 +399,7 @@ msgid "The following information is printed, in this order: number of DOS line b msgstr "Les informations suivantes sont affichées dans cet ordre: le nombre de sauts de ligne DOS, le nombre de sauts de ligne Unix, le nombre de sauts de ligne Mac, la marque d'ordre des octets, texte ou binaire, nom du fichier." #. type: textblock -#: dos2unix.pod:274 +#: dos2unix.pod:274 dos2unix.pod:290 msgid "Example output:" msgstr "Exemple de sortie :" @@ -434,116 +434,152 @@ msgstr "Notez qu'un fichier binaire peut parfois être considéré à tord comme #. type: textblock #: dos2unix.pod:287 +msgid "If in addition option C<-e> or C<--add-eol> is used also the type of the line break of the last line is printed, or C if there is none." +msgstr "Si l'option C<-e> ou C<--add-eol> est également utilisée, le type du saut de ligne de la dernière ligne est affiché ou C est affiché s'il n'y en a pas." + +#. type: verbatim +#: dos2unix.pod:292 +#, no-wrap +msgid "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" +msgstr "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:297 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Des fanions facultatifs peuvent être ajoutés pour changer la sortie. Un ou plusieurs fanions peuvent être ajoutés." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:302 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:304 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "Afficher les lignes d'information du fichier suivies d'un caractère nul au lieu d'un saut de ligne. Cela permet d'interpréter correctement les noms de fichiers avec des espaces ou des guillemets quand le fanion c est utilisé. Utilisez ce fanion avec les options C<-0> ou C<--null> de xargs(1)." #. type: =item -#: dos2unix.pod:299 +#: dos2unix.pod:309 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:301 +#: dos2unix.pod:311 msgid "Print number of DOS line breaks." msgstr "Affiche le nombre de sauts de ligne DOS." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:313 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:315 msgid "Print number of Unix line breaks." msgstr "Affiche le nombre de sauts de ligne Unix." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:317 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:319 msgid "Print number of Mac line breaks." msgstr "Affiche le nombre de sauts de ligne Mac." #. type: =item -#: dos2unix.pod:311 +#: dos2unix.pod:321 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:323 msgid "Print the byte order mark." msgstr "Afficher la marque d'ordre des octets." #. type: =item -#: dos2unix.pod:315 +#: dos2unix.pod:325 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:317 +#: dos2unix.pod:327 msgid "Print if file is text or binary." msgstr "Affiche si le fichier est texte ou binaire." #. type: =item -#: dos2unix.pod:319 +#: dos2unix.pod:329 +msgid "B" +msgstr "B" + +#. type: textblock +#: dos2unix.pod:331 +msgid "Print the type of the line break of the last line, or C if there is none." +msgstr "Affiche le type du saut de ligne de la dernière ligne ou C s'il n'y en a pas." + +#. type: =item +#: dos2unix.pod:333 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:321 +#: dos2unix.pod:335 msgid "Print only the files that would be converted." msgstr "Affiche uniquement les fichiers qui seraient convertis." #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:337 msgid "With the C flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Avec le fanion C, dos2unix n'affichera que les fichiers contenant des sauts de ligne DOS alors que unix2dos n'affichera que les noms des fichiers aillant des sauts de ligne Unix." +#. type: textblock +#: dos2unix.pod:340 +msgid "If in addition option C<-e> or C<--add-eol> is used also the files that lack a line break on the last line will be printed." +msgstr "Si l'option C<-e> ou C<--add-eol> est également utilisée, les fichiers qui n'ont pas de saut de ligne à la dernière ligne seront affichés." + #. type: =item -#: dos2unix.pod:326 +#: dos2unix.pod:343 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:345 msgid "Print a header." msgstr "Afficher un en-tête." #. type: =item -#: dos2unix.pod:330 +#: dos2unix.pod:347 msgid "B

" msgstr "B

" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:349 msgid "Show file names without path." msgstr "Montrer les noms des fichiers sans le chemin." #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:353 msgid "Examples:" msgstr "Exemples:" #. type: textblock -#: dos2unix.pod:338 +#: dos2unix.pod:355 msgid "Show information for all *.txt files:" msgstr "Afficher les informations pour tous les fichier *.txt :" #. type: verbatim -#: dos2unix.pod:340 +#: dos2unix.pod:357 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -553,12 +589,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:342 +#: dos2unix.pod:359 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Afficher uniquement le nombre de sauts de ligne DOS et Unix :" #. type: verbatim -#: dos2unix.pod:344 +#: dos2unix.pod:361 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -568,12 +604,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:346 +#: dos2unix.pod:363 msgid "Show only the byte order mark:" msgstr "Montrer uniquement la marque d'ordre des octets :" #. type: verbatim -#: dos2unix.pod:348 +#: dos2unix.pod:365 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -583,12 +619,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:350 +#: dos2unix.pod:367 msgid "List the files that have DOS line breaks:" msgstr "Liste les fichiers qui ont des sauts de ligne DOS :" #. type: verbatim -#: dos2unix.pod:352 +#: dos2unix.pod:369 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -598,12 +634,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:354 +#: dos2unix.pod:371 msgid "List the files that have Unix line breaks:" msgstr "Liste les fichiers qui ont des sauts de ligne Unix :" #. type: verbatim -#: dos2unix.pod:356 +#: dos2unix.pod:373 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -613,12 +649,27 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:358 +#: dos2unix.pod:375 +msgid "List the files that have DOS line breaks or lack a line break on the last line:" +msgstr "Liste les fichiers qui ont des sauts de ligne DOS ou qui n'ont pas de saut de ligne à la dernière ligne." + +#. type: verbatim +#: dos2unix.pod:377 +#, no-wrap +msgid "" +" dos2unix -e -ic *.txt\n" +"\n" +msgstr "" +" dos2unix -e -ic *.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:379 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "Ne converti que les fichiers qui ont des sauts de lignes DOS et laisse les autres fichiers inchangés:" #. type: verbatim -#: dos2unix.pod:360 +#: dos2unix.pod:381 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -628,12 +679,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:362 +#: dos2unix.pod:383 msgid "Find text files that have DOS line breaks:" msgstr "Trouve les fichiers texte qui ont des sauts de ligne DOS :" #. type: verbatim -#: dos2unix.pod:364 +#: dos2unix.pod:385 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -643,122 +694,122 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:366 +#: dos2unix.pod:387 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:368 +#: dos2unix.pod:389 msgid "Keep the date stamp of output file same as input file." msgstr "La date du fichier de sortie est la même que celle du fichier d'entrée." #. type: =item -#: dos2unix.pod:370 +#: dos2unix.pod:391 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:372 +#: dos2unix.pod:393 msgid "Display program's license." msgstr "Affiche la licence du programme." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:395 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:397 msgid "Add additional newline." msgstr "Ajoute des sauts de lignes additionnels." #. type: textblock -#: dos2unix.pod:378 +#: dos2unix.pod:399 msgid "B: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B: Seuls les sauts de lignes du DOS sont changés en deux sauts de lignes de Unix. En mode Mac, seuls les sauts de lignes Mac sont changés en deux sauts de lignes Unix." #. type: textblock -#: dos2unix.pod:382 +#: dos2unix.pod:403 msgid "B: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B: Seuls les sauts de lignes Unix sont changés en deux sauts de lignes du DOS. En mode Mac, les sauts de lignes Unix sont remplacés par deux sauts de lignes Mac." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:406 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:408 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "Écrit une marque d'ordre des octets (BOM) dans le fichier de sortie. Par défaut une BOM UTF-8 est écrite." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:411 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "Lorsque le fichier d'entrée est en UTF-16 et que l'option C<-u> est utilisée, une BOM UTF-16 est écrite." #. type: textblock -#: dos2unix.pod:393 +#: dos2unix.pod:414 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "N'utilisez jamais cette option quand l'encodage du fichier de sortie n'est ni UTF-8 ni UTF-16 ni GB18030. Consultez également la section UNICODE." #. type: =item -#: dos2unix.pod:397 +#: dos2unix.pod:418 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile FICHIER_ENTRÉE FICHIER_SORTIE …>" #. type: textblock -#: dos2unix.pod:399 +#: dos2unix.pod:420 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I be used or you I lose your files." msgstr "Nouveau mode de fichiers. Convertit le fichier FICHER_ENTRÉE et écrit la sortie dans le fichier FICHIER_SORTIE. Les noms des fichiers doivent être indiqués par paires. Les caractères de remplacement I doivent I être utilisés ou vous I vos fichiers." #. type: textblock -#: dos2unix.pod:403 +#: dos2unix.pod:424 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "La personne qui démarre la conversion dans le nouveau mode (pairé) des fichiers sera le propriétaire du fichier converti. Les permissions de lecture/écriture du nouveau fichier seront les permissions du fichier original moins le umask(1) de la personne qui exécute la conversion." #. type: =item -#: dos2unix.pod:408 +#: dos2unix.pod:429 msgid "B<--no-allow-chown>" msgstr "B<--no-allow-chown>" #. type: textblock -#: dos2unix.pod:410 +#: dos2unix.pod:431 msgid "Don't allow file ownership change in old file mode (default)." msgstr "Ne pas autoriser le changement du propriétaire du fichier dans l'ancien mode de fichier (par défaut)." #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:433 msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." msgstr "Interrompt la conversion si l'utilisateur ou le groupe propriétaire du fichier original ne peuvent pas être préservés dans l'ancien mode de fichier. Voyez aussi les options C<-o> et C<-n>. Cette option est uniquement présente si dos2unix dispose des fonctionnalités pour préserver l'utilisateur ou le groupe propriétaire des fichiers." #. type: =item -#: dos2unix.pod:417 +#: dos2unix.pod:438 msgid "B<--no-add-eol>" msgstr "B<--no-add-eol>" #. type: textblock -#: dos2unix.pod:419 +#: dos2unix.pod:440 msgid "Do not add a line break to the last line if there isn't one." msgstr "N'ajoute pas de saut de ligne à la dernière ligne s'il n'y en a pas." #. type: =item -#: dos2unix.pod:421 +#: dos2unix.pod:442 msgid "B<-O, --to-stdout>" msgstr "B<-O, --to-stdout>" #. type: textblock -#: dos2unix.pod:423 +#: dos2unix.pod:444 msgid "Write to standard output, like a Unix filter. Use option C<-o> to go back to old file (in-place) mode." msgstr "Écrit vers la sortie standard, comme un filtre Unix. Utilisez l'option C<-o> pour revenir au mode de l'ancien fichier (en place)." #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:447 msgid "Combined with option C<-e> files can be properly concatenated. No merged last and first lines, and no Unicode byte order marks in the middle of the concatenated file. Example:" msgstr "Combiné avec l'option C<-e>, les fichiers peuvent être concaténés correctement. Les première et dernière lignes ne sont pas fusionnées et il n'y a pas de marque d'ordre des octets au milieu du fichier concaténé. Exemple :" #. type: verbatim -#: dos2unix.pod:430 +#: dos2unix.pod:451 #, no-wrap msgid "" " dos2unix -e -O file1.txt file2.txt > output.txt\n" @@ -768,32 +819,32 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:432 +#: dos2unix.pod:453 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile FICHIER …>" #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:455 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "Ancien mode de fichiers. Convertit le fichier FICHIER et écrit la sortie dedans. Le programme fonctionne dans ce mode par défaut. Les noms avec des caractères de remplacement peuvent être utilisés." #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:458 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "Dans l'ancien mode (en place) des fichiers, les fichiers convertis ont le même propriétaire, groupe et permissions lecture/écriture que le fichier original. Idem quand le fichier est converti par un utilisateur qui a la permission d'écrire dans le fichier (par exemple, root). La conversion est interrompue si il n'est pas possible de conserver les valeurs d'origine. Le changement de propriétaire pourrait signifier que le propriétaire original n'est plus en mesure de lire le fichier. Le changement de groupe pourrait être un risque pour la sécurité. Le fichier pourrait être rendu accessible en lecture par des personnes à qui il n'est pas destiné. La conservation du propriétaire, du groupe et des permissions de lecture/écriture n'est supportée que sous Unix." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:467 msgid "To check if dos2unix has support for preserving the user and group ownership of files type C." msgstr "Pour vérifier si dos2unix dispose des fonctions pour préserver l'utilisateur et le groupe propriétaire du fichier, tapez C." #. type: textblock -#: dos2unix.pod:449 +#: dos2unix.pod:470 msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" msgstr "La conversion est toujours réalisée via un fichier temporaire. Quand une erreur survient au milieu de la conversion, le fichier temporaire est effacé et le fichier original reste inchangé. Quand la conversion réussi, le fichier original est remplacé par le fichier temporaire. Vous pourriez avoir la permission d'écrire dans le fichier original mais ne pas avoir la permission de remplacer les propriétés de l'utilisateur et du groupe propriétaires sur le fichier temporaire telles qu'elles sont définies sur le fichier original. Cela signifie que vous n'êtes pas en mesure de préserver l'utilisateur ou le groupe propriétaire du fichier original. Dans ce cas, vous pouvez utiliser l'option C<--allow-chown> pour continuer la conversion." #. type: verbatim -#: dos2unix.pod:458 +#: dos2unix.pod:479 #, no-wrap msgid "" " dos2unix --allow-chown foo.txt\n" @@ -803,12 +854,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:460 +#: dos2unix.pod:481 msgid "Another option is to use new file mode:" msgstr "Une autre option consiste à utiliser le nouveau mode de fichier:" #. type: verbatim -#: dos2unix.pod:462 +#: dos2unix.pod:483 #, no-wrap msgid "" " dos2unix -n foo.txt foo.txt\n" @@ -818,227 +869,227 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:485 msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." msgstr "L'avantage de l'option C<--allow-chown> est que vous pouvez utiliser des caractères de remplacement et les propriétaires seront préservés dans la mesure du possible." #. type: =item -#: dos2unix.pod:467 +#: dos2unix.pod:488 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:469 +#: dos2unix.pod:490 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Mode silencieux. Supprime les avertissements et les messages. La valeur de sortie est zéro sauf quand de mauvaises options sont utilisées sur la ligne de commande." #. type: =item -#: dos2unix.pod:472 +#: dos2unix.pod:493 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:495 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "Supprime la marque d'ordre des octets (BOM). N'écrit pas la BOM dans le fichier de sortie. Ceci est le comportement par défaut lorsque les sauts de lignes sont convertis au format Unix. Consultez aussi l'option C<-b>." #. type: =item -#: dos2unix.pod:478 +#: dos2unix.pod:499 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:501 msgid "Skip binary files (default)." msgstr "Ignore les fichiers binaires (par défaut)." #. type: textblock -#: dos2unix.pod:482 +#: dos2unix.pod:503 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "Ignorer les fichiers binaires sert à éviter les erreurs accidentelles. Attention que la détection de fichiers binaires n'est pas fiable à 100%. Les fichiers en entrée sont analysés pour y trouver des symboles binaires qui ne sont habituellement pas rencontrés dans des fichiers textes. Il est cependant possible qu'un fichier binaire ne contienne que des caractères textes normaux. Un tel fichier serait erronément traité comme un fichier texte." #. type: =item -#: dos2unix.pod:488 +#: dos2unix.pod:509 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:490 +#: dos2unix.pod:511 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "Conserve l'encodage UTF-16 original du fichier d'entrée. Le fichier de sortie sera écrit dans le même encodage UTF-16 (petit ou grand boutien) que le fichier d'entrée. Ceci évite la transformation en UTF-8. Une BOM UTF-16 sera écrite en conséquent. Cette option peut être désactivée avec l'option C<-ascii>." #. type: =item -#: dos2unix.pod:495 +#: dos2unix.pod:516 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:497 +#: dos2unix.pod:518 msgid "Assume that the input file format is UTF-16LE." msgstr "Suppose que le fichier d'entrée est au format UTF-16LE." #. type: textblock -#: dos2unix.pod:499 +#: dos2unix.pod:520 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "Quand il y a un indicateur d'ordre des octets dans le fichier d'entrée, l'indicateur a priorité sur cette option." #. type: textblock -#: dos2unix.pod:502 +#: dos2unix.pod:523 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "Si vous vous êtes trompé sur le format du fichier d'entrée (par exemple, ce n'était pas un fichier UTF16-LE) et que la conversion réussi, vous obtiendrez un fichier UTF-8 contenant le mauvais texte. Vous pouvez récupérer le fichier original avec iconv(1) en convertissant le fichier de sortie UTF-8 vers du UTF-16LE." #. type: textblock -#: dos2unix.pod:507 +#: dos2unix.pod:528 msgid "The assumption of UTF-16LE works as a I. By switching to the default I mode the UTF-16LE assumption is turned off." msgstr "La présupposition de l'UTF-16LE fonctionne comme un I. En utilisant le mode I par défaut, UTF-16LE n'est plus présupposé." #. type: =item -#: dos2unix.pod:510 +#: dos2unix.pod:531 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:512 +#: dos2unix.pod:533 msgid "Assume that the input file format is UTF-16BE." msgstr "Suppose que le fichier d'entrée est au format UTF-16BE." #. type: textblock -#: dos2unix.pod:514 +#: dos2unix.pod:535 msgid "This option works the same as option C<-ul>." msgstr "Cette option fonctionne comme l'option C<-ul>." #. type: =item -#: dos2unix.pod:516 +#: dos2unix.pod:537 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:518 +#: dos2unix.pod:539 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "Affiche des messages verbeux. Des informations supplémentaires sont affichées à propos des marques d'ordre des octets et du nombre de sauts de lignes convertis." #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:542 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:523 +#: dos2unix.pod:544 msgid "Follow symbolic links and convert the targets." msgstr "Suit les liens symboliques et convertit les cibles." #. type: =item -#: dos2unix.pod:525 +#: dos2unix.pod:546 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:527 +#: dos2unix.pod:548 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "Remplace les liens symboliques par les fichiers convertis (les fichiers cibles originaux restent inchangés)." #. type: =item -#: dos2unix.pod:530 +#: dos2unix.pod:551 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:532 +#: dos2unix.pod:553 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Ne change pas les liens symboliques ni les cibles (par défaut)." #. type: =item -#: dos2unix.pod:534 +#: dos2unix.pod:555 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:536 +#: dos2unix.pod:557 msgid "Display version information and exit." msgstr "Affiche les informations de version puis arrête." #. type: =head1 -#: dos2unix.pod:540 +#: dos2unix.pod:561 msgid "MAC MODE" msgstr "MODE MAC" #. type: textblock -#: dos2unix.pod:542 -msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." -msgstr "En mode normal, les sauts de lignes sont convertis du DOS vers Unix et inversement. Les sauts de lignes Mac ne sont pas convertis." +#: dos2unix.pod:563 +msgid "By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." +msgstr "Par défaut, les sauts de lignes sont convertis du DOS vers Unix et inversement. Les sauts de lignes Mac ne sont pas convertis." #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:566 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "En mode Mac, les sauts de lignes sont convertis du format Mac au format Unix et inversement. Les sauts de lignes DOS ne sont pas changés." #. type: textblock -#: dos2unix.pod:548 +#: dos2unix.pod:569 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C or C." msgstr "Pour fonctionner en mode Mac, utilisez l'option en ligne de commande C<-c mac> ou utilisez les commandes C ou C." #. type: =head1 -#: dos2unix.pod:551 +#: dos2unix.pod:572 msgid "CONVERSION MODES" msgstr "MODES DE CONVERSION" #. type: =item -#: dos2unix.pod:555 +#: dos2unix.pod:576 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:557 -msgid "In mode C only line breaks are converted. This is the default conversion mode." -msgstr "En mode C, seuls les sauts de lignes sont convertis. Ceci est le mode de conversion par défaut." +#: dos2unix.pod:578 +msgid "This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling B mode disables B<7bit> and B mode." +msgstr "Ceci est le mode de conversion par défaut. Ce mode convertit les fichiers ASCII en fichiers compatibles avec l'ASCII tel que UTF-9. Activer le mode B désactive les modes B<7bit> et B." #. type: textblock -#: dos2unix.pod:560 -msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." -msgstr "Bien que le nom de ce mode soit ASCII, qui est un standard 7 bits, ce mode travail en réalité sur 8 bits. Utilisez toujours ce mode lorsque vous convertissez des fichiers Unicode UTF-8." +#: dos2unix.pod:582 +msgid "If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has UTF-16 support type C. See also section UNICODE." +msgstr "Si dos2unix supporte UTF-16, les fichiers encodés en UTF-16 sont convertis vers l'encodage des caractères des paramètres linguistiques courants sur les systèmes POSIX et vers UTF-8 sous Windows. Activer le mode B désactive l'option pour garder l'encodage UTF-8 (C<-u>) et les options qui supposent une entrée en UTF-16 (C<-ul> et C<-ub>). Pour voir si dos2unix supporte UTF-16, tapez C. Consultez aussi la section UNICODE." #. type: =item -#: dos2unix.pod:564 +#: dos2unix.pod:588 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:566 +#: dos2unix.pod:590 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "Dans ce mode, tous les caractères 8 bits non ASCII (avec des valeurs entre 128 et 255) sont remplacés par une espace 7 bits." #. type: =item -#: dos2unix.pod:569 +#: dos2unix.pod:593 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:571 +#: dos2unix.pod:595 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Les caractères sont convertis entre un jeu de caractères DOS (code page) et le jeu de caractères ISO-8859-1 (Latin-1) de Unix. Les caractères DOS sans équivalent ISO-8859-1, pour lesquels la conversion n'est pas possible, sont remplacés par un point. La même chose est valable pour les caractères ISO-8859-1 sans équivalent DOS." #. type: textblock -#: dos2unix.pod:576 +#: dos2unix.pod:600 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "Quand seule l'option C<-iso> est utilisée, dos2unix essaie de déterminer le code page actif. Quand ce n'est pas possible, dos2unix utilise le code page CP437 par défaut qui est surtout utilisé aux USA. Pour forcer l'utilisation d'un code page spécifique, utilisez les options C<-437> (US), C<-850> (Europe de l'ouest), C<-860> (portugais), C<-863> (français canadien) ou C<-865> (nordique). Le code page CP1252 de Windows (Europe de l'ouest) est également supporté avec l'option C<-1252>. Pour d'autres codes pages, utilisez dos2unix avec iconv(1). Iconv supporte une longue liste de codages de caractères." #. type: textblock -#: dos2unix.pod:585 +#: dos2unix.pod:609 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "N'utilisez jamais la conversion ISO sur des fichiers textes Unicode. Cela va corrompre les fichiers encodés en UTF-8." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:611 msgid "Some examples:" msgstr "Quelques exemples:" #. type: textblock -#: dos2unix.pod:589 +#: dos2unix.pod:613 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Convertir du code page par défaut du DOS au Latin-1 Unix :" #. type: verbatim -#: dos2unix.pod:591 +#: dos2unix.pod:615 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -1048,12 +1099,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:593 +#: dos2unix.pod:617 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Convertir du CP850 du DOS au Latin-1 Unix :" #. type: verbatim -#: dos2unix.pod:595 +#: dos2unix.pod:619 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -1063,12 +1114,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:597 +#: dos2unix.pod:621 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Convertir du CP1252 de Windows au Latin-1 de Unix :" #. type: verbatim -#: dos2unix.pod:599 +#: dos2unix.pod:623 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -1078,12 +1129,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:601 +#: dos2unix.pod:625 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Convertir le CP1252 de Windows en UTF-8 de Unix (Unicode) :" #. type: verbatim -#: dos2unix.pod:603 +#: dos2unix.pod:627 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -1093,12 +1144,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:605 +#: dos2unix.pod:629 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Convertir du Latin-1 de Unix au code page par défaut de DOS :" #. type: verbatim -#: dos2unix.pod:607 +#: dos2unix.pod:631 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -1108,12 +1159,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:609 +#: dos2unix.pod:633 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Convertir le Latin-1 de Unix en CP850 du DOS :" #. type: verbatim -#: dos2unix.pod:611 +#: dos2unix.pod:635 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1123,12 +1174,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:637 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Convertir le Latin-1 de Unix en CP1252 de Windows :" #. type: verbatim -#: dos2unix.pod:615 +#: dos2unix.pod:639 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1138,12 +1189,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:617 +#: dos2unix.pod:641 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Convertir le UTF-8 de Unix (Unicode) en CP1252 de Windows :" #. type: verbatim -#: dos2unix.pod:619 +#: dos2unix.pod:643 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1153,142 +1204,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:621 +#: dos2unix.pod:645 msgid "See also L and L." msgstr "Consultez aussi L et L." #. type: =head1 -#: dos2unix.pod:626 +#: dos2unix.pod:650 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:628 +#: dos2unix.pod:652 msgid "Encodings" msgstr "Codages" #. type: textblock -#: dos2unix.pod:630 +#: dos2unix.pod:654 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Il existe plusieurs codages Unicode. Sous Unix et Linux, les fichiers sont généralement codés en UTF-8. Sous Windows, les fichiers textes Unicode peuvent être codés en UTF-8, UTF-16 ou UTF-16 gros boutien mais ils sont majoritairement codés au format UTF-16." #. type: =head2 -#: dos2unix.pod:635 +#: dos2unix.pod:659 msgid "Conversion" msgstr "Conversion" #. type: textblock -#: dos2unix.pod:637 -msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." -msgstr "Les fichiers textes Unicode peuvent avoir des sauts de lignes DOS, Unix ou Mac, tout comme les fichiers textes normaux." +#: dos2unix.pod:661 +msgid "Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files." +msgstr "Les fichiers textes Unicode peuvent avoir des sauts de lignes DOS, Unix ou Mac, tout comme les fichiers textes ASCII." #. type: textblock -#: dos2unix.pod:640 +#: dos2unix.pod:664 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Toutes les versions de dos2unix et unix2dos peuvent convertir des fichiers codés en UTF-8 car UTF-8 a été conçu pour être rétro-compatible avec l'ASCII." #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:667 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C." msgstr "Dos2unix et unix2dos, avec le support pour l'Unicode UTF-16, peuvent lire les fichiers textes codés sous forme petit boutien ou gros boutien. Pour savoir si dos2unix a été compilé avec le support UTF-16 tapez C." #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:671 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "Sous Unix/Linux, les fichiers encodés en UTF-16 sont convertis vers l'encodage des caractères de la localisation. Utilisez locale(1) pour découvrir quel encodage de caractères est utilisé. Lorsque la conversion n'est pas possible, une erreur de conversion est produite et le fichier est abandonné." #. type: textblock -#: dos2unix.pod:652 +#: dos2unix.pod:676 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "Sous Windows, les fichiers UTF-16 sont convertis par défaut en UTF-8. Les fichiers textes formatés en UTF-8 sont bien supportés sous Windows et Unix/Linux." #. type: textblock -#: dos2unix.pod:655 +#: dos2unix.pod:679 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "Les codages UTF-16 et UTF-8 sont parfaitement compatibles. Il n'y a pas de pertes lors de la conversion. Lorsqu'une erreur de conversion UTF-16 vers UTF-8 survient, par exemple, quand le fichier d'entrée UTF-16 contient une erreur, le fichier est ignoré." #. type: textblock -#: dos2unix.pod:659 +#: dos2unix.pod:683 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "Quand l'option C<-u> est utilisée, le fichier de sortie est écrit dans le même encodage UTF-16 que le fichier d'entrée. L'option C<-u> empêche la conversion en UTF-8." #. type: textblock -#: dos2unix.pod:662 +#: dos2unix.pod:686 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "Dos2unix et unix2dos n'ont pas d'option pour convertir des fichiers UTF-8 en UTF-16." #. type: textblock -#: dos2unix.pod:664 +#: dos2unix.pod:688 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "Les modes de conversion ISO et 7 bits ne fonctionnent pas sur des fichiers UTF-16." #. type: =head2 -#: dos2unix.pod:666 +#: dos2unix.pod:690 msgid "Byte Order Mark" msgstr "Marque d'ordre des octets" #. type: textblock -#: dos2unix.pod:668 -msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." -msgstr "Les fichiers textes Unicode sous Windows on généralement un indicateur d'ordre des octets (BOM) car de nombreux programmes Windows (y compris Notepad) ajoutent cet indicateur par défaut. Consultez aussi L." +#: dos2unix.pod:692 +msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." +msgstr "Les fichiers textes Unicode sous Windows on généralement un indicateur d'ordre des octets (BOM) car de nombreux programmes Windows (y compris Notepad) ajoutent cet indicateur par défaut. Consultez aussi L." #. type: textblock -#: dos2unix.pod:672 +#: dos2unix.pod:696 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "Sous Unix, les fichiers Unicodes n'ont habituellement pas de BOM. Il est supposé que les fichiers textes sont codés selon le codage de l'environnement linguistique." #. type: textblock -#: dos2unix.pod:675 +#: dos2unix.pod:699 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "Dos2unix ne peut détecter que le fichier est au format UTF-16 si le fichier n'a pas de BOM. Quand le fichier UTF-16 n'a pas cet indicateur, dos2unix voit le fichier comme un fichier binaire." #. type: textblock -#: dos2unix.pod:679 +#: dos2unix.pod:703 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Utilisez l'option C<-ul> ou C<-ub> pour convertir un fichier UTF-16 sans BOM." #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:705 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "Dos2unix, par défaut, n'écrit pas de BOM dans le fichier de sortie. Avec l'option C<-b>, Dos2unix écrit une BOM quand le fichier d'entrée a une BOM." #. type: textblock -#: dos2unix.pod:684 +#: dos2unix.pod:708 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "Unix2dos écrit par défaut une BOM dans le fichier de sortie quand le fichier d'entrée a une BOM. Utilisez l'option C<-r> pour supprimer la BOM." #. type: textblock -#: dos2unix.pod:687 +#: dos2unix.pod:711 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "Dos2unix et unix2dos écrivent toujours une BOM quand l'option C<-m> est utilisée." #. type: =head2 -#: dos2unix.pod:689 +#: dos2unix.pod:713 msgid "Unicode file names on Windows" msgstr "Noms de fichiers unicode sous Windows" #. type: textblock -#: dos2unix.pod:691 +#: dos2unix.pod:715 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C." msgstr "Dos2unix supporte, en option, la lecture et l'écriture de noms de fichiers Unicode dans la ligne de commande de Windows. Cela signifie que dos2unix peut ouvrir des fichiers qui ont, dans leur nom, des caractères n'appartenant pas au code page système ANSI par défaut. Pour voir si dos2unix pour Windows a été compilé avec le support des noms de fichiers Unicode, tapez C." #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:721 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "Il y a quelques soucis avec l'affichage de noms de fichiers Unicode dans une console Windows. Voyez l'option C<-D>, C<--display-enc>. Les noms de fichiers peuvent être mal affichés dans la console mais les fichiers seront écrits avec les bons noms." #. type: =head2 -#: dos2unix.pod:701 +#: dos2unix.pod:725 msgid "Unicode examples" msgstr "Exemples Unicode" #. type: textblock -#: dos2unix.pod:703 +#: dos2unix.pod:727 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Convertir de l'UTF-16 Windows (avec BOM) vers l'UTF-8 de Unix :" #. type: verbatim -#: dos2unix.pod:705 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1298,12 +1349,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:731 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Convertir de l'UTF-16LE de Windows (sans BOM) vers l'UTF-8 de Unix :" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:733 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1313,12 +1364,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:735 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Convertir de l'UTF-8 de Unix vers l'UTF-8 de Windows avec BOM :" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:737 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1328,12 +1379,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:739 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Convertir de l'UTF-8 de Unix vers l'UTF-16 de Windows :" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:741 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1343,47 +1394,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:719 +#: dos2unix.pod:743 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:721 -msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." -msgstr "GB18030 est un standard du gouvernement chinois. Tout logiciel vendu en Chine doit officiellement supporter un sous ensemble obligatoire du standard GB18030. Consultez L." +#: dos2unix.pod:745 +msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." +msgstr "GB18030 est un standard du gouvernement chinois. Tout logiciel vendu en Chine doit officiellement supporter un sous ensemble obligatoire du standard GB18030. Consultez L." #. type: textblock -#: dos2unix.pod:725 +#: dos2unix.pod:749 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "GB18030 est entièrement compatible avec Unicode et peut être considéré comme étant un format de transformation unicode. Comme UTF-8, GB18030 est compatible avec ASCII. GB18030 est aussi compatible avec le code page 936 de Windows aussi connu comme GBK." #. type: textblock -#: dos2unix.pod:729 +#: dos2unix.pod:753 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C to get the list of supported locales." msgstr "Sous Unix/Linux, les fichiers UTF-16 sont convertis en GB18030 quand l'encodage de l'environnement linguistique est GB18030. Notez que cela ne fonctionnera que si l'environnement linguistique est supporté par le système. Utilisez la commande C pour obtenir la liste des environnements linguistiques supportés." #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:757 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "Sous Windows, vous avez besoin de l'option C<-gb> pour convertir UTF-16 en GB18030." #. type: textblock -#: dos2unix.pod:735 +#: dos2unix.pod:759 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "Les fichiers encodés en GB18030 peuvent avoir une marque d'ordre des octets, comme les fichiers Unicode." #. type: =head1 -#: dos2unix.pod:737 +#: dos2unix.pod:761 msgid "EXAMPLES" msgstr "EXEMPLES" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:763 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Lire l'entrée depuis « stdin » et écrire la sortie vers « stdout » :" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:765 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1395,12 +1446,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:744 +#: dos2unix.pod:768 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "Convertir et remplacer a.txt. Convertir et remplace b.txt :" #. type: verbatim -#: dos2unix.pod:746 +#: dos2unix.pod:770 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1412,12 +1463,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:749 +#: dos2unix.pod:773 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "Convertir et remplacer a.txt en mode de conversion ascii :" #. type: verbatim -#: dos2unix.pod:751 +#: dos2unix.pod:775 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1427,12 +1478,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:753 +#: dos2unix.pod:777 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "Convertir et remplacer a.txt en mode de conversion ascii. Convertir et remplacer b.txt en mode de conversion 7 bits :" #. type: verbatim -#: dos2unix.pod:756 +#: dos2unix.pod:780 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1446,12 +1497,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:760 +#: dos2unix.pod:784 msgid "Convert a.txt from Mac to Unix format:" msgstr "Convertir a.txt depuis le format Mac vers le format Unix :" #. type: verbatim -#: dos2unix.pod:762 +#: dos2unix.pod:786 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1463,12 +1514,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:765 +#: dos2unix.pod:789 msgid "Convert a.txt from Unix to Mac format:" msgstr "Convertir a.txt du format Unix au format Mac :" #. type: verbatim -#: dos2unix.pod:767 +#: dos2unix.pod:791 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1480,12 +1531,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:770 +#: dos2unix.pod:794 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "Convertir et remplacer a.txt tout en conservant la date originale :" #. type: verbatim -#: dos2unix.pod:772 +#: dos2unix.pod:796 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1497,12 +1548,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:775 +#: dos2unix.pod:799 msgid "Convert a.txt and write to e.txt:" msgstr "Convertir a.txt et écrire dans e.txt :" #. type: verbatim -#: dos2unix.pod:777 +#: dos2unix.pod:801 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1512,12 +1563,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:779 +#: dos2unix.pod:803 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "Convertir a.txt et écrire dans e.txt. La date de e.txt est la même que celle de a.txt :" #. type: verbatim -#: dos2unix.pod:781 +#: dos2unix.pod:805 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1527,12 +1578,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:783 +#: dos2unix.pod:807 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "Convertir et remplacer a.txt. Convertir b.txt et écrire dans e.txt :" #. type: verbatim -#: dos2unix.pod:785 +#: dos2unix.pod:809 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1544,12 +1595,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:788 +#: dos2unix.pod:812 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "Convertir c.txt et écrire dans e.txt. Convertir et remplacer a.txt. Convertir et remplacer b.txt. Convertir d.txt et écrire dans f.txt :" #. type: verbatim -#: dos2unix.pod:791 +#: dos2unix.pod:815 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1559,17 +1610,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:793 +#: dos2unix.pod:817 msgid "RECURSIVE CONVERSION" msgstr "CONVERSIONS RÉCURSIVES" #. type: textblock -#: dos2unix.pod:795 +#: dos2unix.pod:819 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "Dans un shell Unix, les commandes find(1) et xargs(1) peuvent être utilisées pour exécuter dos2unix récursivement sur tous les fichiers textes dans une arborescence de répertoires. Par exemple, pour convertir tous les fichiers .txt dans les répertoires sous le répertoire courant, tapez:" #. type: verbatim -#: dos2unix.pod:799 +#: dos2unix.pod:823 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1579,12 +1630,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:801 +#: dos2unix.pod:825 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "L'option C<-print0> de find(1) et l'option correspondante C<-0> de xargs(1) sont nécessaires quand il y a des fichiers avec des espaces ou des guillemets dans leur nom. Sinon, ces options peuvent être omises. Une autre possibilité est d'utiliser find(1) avec l'option C<-exec>:" #. type: verbatim -#: dos2unix.pod:805 +#: dos2unix.pod:829 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1594,12 +1645,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:807 +#: dos2unix.pod:831 msgid "In a Windows Command Prompt the following command can be used:" msgstr "En ligne de commande sous Windows, la commande suivante peut être utilisée :" #. type: verbatim -#: dos2unix.pod:809 +#: dos2unix.pod:833 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1611,12 +1662,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:811 +#: dos2unix.pod:835 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "Les utilisateurs de PowerShell peuvent utiliser la commande suivante dans le PowerShell de Windows :" #. type: verbatim -#: dos2unix.pod:813 +#: dos2unix.pod:837 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1626,22 +1677,22 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:816 +#: dos2unix.pod:840 msgid "LOCALIZATION" msgstr "PARAMÈTRES LINGUISTIQUES" #. type: =item -#: dos2unix.pod:820 +#: dos2unix.pod:844 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:822 +#: dos2unix.pod:846 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "La langue principale est sélectionnée par la variable d'environnement LANG. La variable LANG est composée de plusieurs parties. La première partie est le code de la langue en minuscules. La deuxième partie est le code du pays en majuscules précédé d'un souligné. Elle est facultative. Il y a aussi une troisième partie facultative qui est le codage des caractères précédé par un point. Voici quelques exemples pour un shell au standard POSIX:" #. type: verbatim -#: dos2unix.pod:829 +#: dos2unix.pod:853 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1663,47 +1714,47 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:837 -msgid "For a complete list of language and country codes see the gettext manual: L" -msgstr "La liste complète des codes de langues et de pays est dans le manuel de gettext: L" +#: dos2unix.pod:861 +msgid "For a complete list of language and country codes see the gettext manual: L" +msgstr "La liste complète des codes de langues et de pays est dans le manuel de gettext: L" #. type: textblock -#: dos2unix.pod:840 +#: dos2unix.pod:864 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "Sur les systèmes Unix, vous pouvez utiliser la commande locale(1) pour obtenir des informations sur l'environnement linguistique." #. type: =item -#: dos2unix.pod:843 +#: dos2unix.pod:867 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:845 -msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" -msgstr "Avec la variable d'environnement LANGUAGE, vous pouvez spécifier une liste de langues prioritaires séparées par des deux-points. Dos2unix fait passer LANGUAGE avant LANG. Par exemple, pour utiliser le français avant l'anglais: C. Vous devez d'abord activer l'environnement linguistique en assignant une valeur autre que « C » à LANG (ou LC_ALL). Ensuite, vous pourrez utiliser la liste de priorité avec la variable LANGUAGE. Voyez également le manuel de gettext: L" +#: dos2unix.pod:869 +msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" +msgstr "Avec la variable d'environnement LANGUAGE, vous pouvez spécifier une liste de langues prioritaires séparées par des deux-points. Dos2unix fait passer LANGUAGE avant LANG. Par exemple, pour utiliser le français avant l'anglais: C. Vous devez d'abord activer l'environnement linguistique en assignant une valeur autre que « C » à LANG (ou LC_ALL). Ensuite, vous pourrez utiliser la liste de priorité avec la variable LANGUAGE. Voyez également le manuel de gettext: L" #. type: textblock -#: dos2unix.pod:853 +#: dos2unix.pod:877 msgid "If you select a language which is not available you will get the standard English messages." msgstr "Si vous sélectionnez une langue qui n'est pas disponible, vous obtiendrez des messages en anglais standard." #. type: =item -#: dos2unix.pod:857 +#: dos2unix.pod:881 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:859 +#: dos2unix.pod:883 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C. Option B<--version> will display the LOCALEDIR that is used." msgstr "Grâce à la variable d'environnement DOS2UNIX_LOCALEDIR, la variable LOCALEDIR compilée dans l'application peut être remplacée. LOCALEDIR est utilisée pour trouver les fichiers de langue. La valeur par défaut de GNU est C. L'option B<--version> affiche la valeur de LOCALEDIR utilisée." #. type: textblock -#: dos2unix.pod:864 +#: dos2unix.pod:888 msgid "Example (POSIX shell):" msgstr "Exemple (shell POSIX):" #. type: verbatim -#: dos2unix.pod:866 +#: dos2unix.pod:890 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1713,75 +1764,84 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:871 +#: dos2unix.pod:895 msgid "RETURN VALUE" msgstr "VALEUR DE RETOUR" #. type: textblock -#: dos2unix.pod:873 +#: dos2unix.pod:897 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "Zéro est retourné en cas de succès. Si une erreur système se produit, la dernière erreur système est retournée. Pour les autres erreurs, 1 est renvoyé." #. type: textblock -#: dos2unix.pod:876 +#: dos2unix.pod:900 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "La valeur de sortie est toujours zéro en mode silencieux sauf quand de mauvaises options sont utilisées sur la ligne de commande." #. type: =head1 -#: dos2unix.pod:879 +#: dos2unix.pod:903 msgid "STANDARDS" msgstr "STANDARDS" #. type: textblock -#: dos2unix.pod:881 -msgid "L" -msgstr "L" +#: dos2unix.pod:905 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:883 -msgid "L" -msgstr "L" +#: dos2unix.pod:907 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:885 -msgid "L" -msgstr "L" +#: dos2unix.pod:909 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:887 -msgid "L" -msgstr "L" +#: dos2unix.pod:911 +msgid "L" +msgstr "L" #. type: =head1 -#: dos2unix.pod:889 +#: dos2unix.pod:913 msgid "AUTHORS" msgstr "AUTEURS" #. type: textblock -#: dos2unix.pod:891 +#: dos2unix.pod:915 msgid "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer)" msgstr "Benjamin Lin - , Bernd Johannes Wuebben (mode mac2unix) - , Christian Wurll (ajout de saut de ligne supplémentaire) - , Erwin Waterlander - (Mainteneur)" #. type: textblock -#: dos2unix.pod:896 -msgid "Project page: L" -msgstr "Page du projet: L" +#: dos2unix.pod:920 +msgid "Project page: L" +msgstr "Page du projet: L" #. type: textblock -#: dos2unix.pod:898 -msgid "SourceForge page: L" -msgstr "Page SourceForge: L" +#: dos2unix.pod:922 +msgid "SourceForge page: L" +msgstr "Page SourceForge: L" #. type: =head1 -#: dos2unix.pod:900 +#: dos2unix.pod:924 msgid "SEE ALSO" msgstr "VOIR AUSSI" #. type: textblock -#: dos2unix.pod:902 +#: dos2unix.pod:926 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" +#~ msgid "Convert only line breaks. This is the default conversion mode." +#~ msgstr "Convertit uniquement les sauts de lignes. C'est le mode de conversion par défaut." + +#~ msgid "In mode C only line breaks are converted. This is the default conversion mode." +#~ msgstr "En mode C, seuls les sauts de lignes sont convertis. Ceci est le mode de conversion par défaut." + +#~ msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." +#~ msgstr "Bien que le nom de ce mode soit ASCII, qui est un standard 7 bits, ce mode travail en réalité sur 8 bits. Utilisez toujours ce mode lorsque vous convertissez des fichiers Unicode UTF-8." + #~ msgid "" #~ " find -name '*.txt' | xargs dos2unix -ic\n" #~ "\n" diff --git a/dos2unix/po-man/ko.po b/dos2unix/po-man/ko.po index a873210..8bfa88c 100644 --- a/dos2unix/po-man/ko.po +++ b/dos2unix/po-man/ko.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix-man 7.5.0-beta5\n" -"POT-Creation-Date: 2023-04-23 10:34+0200\n" -"PO-Revision-Date: 2023-04-27 12:47+0900\n" +"Project-Id-Version: dos2unix-man 7.5.2-beta3\n" +"POT-Creation-Date: 2023-11-27 22:01+0100\n" +"PO-Revision-Date: 2023-12-01 01:54+0900\n" "Last-Translator: Seong-ho Cho \n" "Language-Team: Korean \n" "Language: ko\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.4.1\n" #. type: =head1 #: dos2unix.pod:52 @@ -147,8 +147,8 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:121 -msgid "Convert only line breaks. This is the default conversion mode." -msgstr "줄 바꿈 문자만 변환합니다. 기본 변환 모드입니다." +msgid "Default conversion mode. See also section CONVERSION MODES." +msgstr "기본 변환 모드입니다. 변환 모드 섹션을 참고하십시오." #. type: =item #: dos2unix.pod:123 @@ -303,7 +303,7 @@ msgstr "ConEmu 콘솔을 사용한다면 ConEmu에서 적절한 글꼴을 자동 #. type: textblock #: dos2unix.pod:208 msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program." -msgstr "유니코드 사용의 단점은 ASCII와 호환성이 없다는 점입니다. 다른 프로그램으로 출력을 전달할 때 쉽게 처리할 수 없습니다." +msgstr "유니코드 사용의 단점은 아스키와 호환성이 없다는 점입니다. 다른 프로그램으로 출력을 전달할 때 쉽게 처리할 수 없습니다." #. type: textblock #: dos2unix.pod:211 @@ -318,12 +318,12 @@ msgstr "B" #. type: textblock #: dos2unix.pod:218 msgid "The advantage of utf8 is that it is compatible with ASCII. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C encoding." -msgstr "utf8의 장점은 ASCII와의 호환성입니다. 콘솔의 글꼴을 트루타입 글꼴로 선택해야 합니다. 트루타입 글꼴로 설정하면 C 인코딩 때와 비슷하게 나타납니다." +msgstr "utf8의 장점은 아스키와의 호환성입니다. 콘솔의 글꼴을 트루타입 글꼴로 선택해야 합니다. 트루타입 글꼴로 설정하면 C 인코딩 때와 비슷하게 나타납니다." #. type: textblock #: dos2unix.pod:222 msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed." -msgstr "단점은 래스터 글꼴을 기본으로 사용하면 ASCII 인코딩 하지 않는 문자를 잘못 나타낼 수 있습니다. 유니코드 파일 이름 뿐만 아니라 번역 메시지 조차 제대로 읽을 수 없습니다. 윈도우에서는 동아시아 지역으로 설정했을 경우 메시지가 나타날 때 콘솔 화면이 상당히 많이 깜빡거리는걸 볼 수 있습니다." +msgstr "단점은 래스터 글꼴을 기본으로 사용하면 아스키 인코딩을 하지 않는 문자를 잘못 나타낼 수 있습니다. 유니코드 파일 이름 뿐만 아니라 번역 메시지 조차 제대로 읽을 수 없습니다. 윈도우에서는 동아시아 지역으로 설정했을 경우 메시지가 나타날 때 콘솔 화면이 상당히 많이 깜빡거리는걸 볼 수 있습니다." #. type: textblock #: dos2unix.pod:228 @@ -401,7 +401,7 @@ msgid "The following information is printed, in this order: number of DOS line b msgstr "다음 정보를 DOS 개행 문자 수, 유닉스 개행 문자 수, 맥 개행 문자 수, 바이트 순서 표시, 텍스트 또는 이진 파일 여부, 파일 이름 순으로 정보를 출력합니다." #. type: textblock -#: dos2unix.pod:274 +#: dos2unix.pod:274 dos2unix.pod:290 msgid "Example output:" msgstr "예제 출력:" @@ -436,116 +436,152 @@ msgstr "때로는 이진 파일을 텍스트 파일로 잘못 알아챌 수도 #. type: textblock #: dos2unix.pod:287 +msgid "If in addition option C<-e> or C<--add-eol> is used also the type of the line break of the last line is printed, or C if there is none." +msgstr "C<-e> 또는 C<--add-eol> 옵션을 추가로 사용하면 행 마지막 개행 문자 형식도 출력하며, 없다면 C을 출력합니다." + +#. type: verbatim +#: dos2unix.pod:292 +#, no-wrap +msgid "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" +msgstr "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:297 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "출력 방식을 바꿀 추가 플래그를 설정할 수 있습니다. 플래그 하나 이상을 추가할 수 있습니다." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:302 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:304 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "파일 정보 행 끝의 개행 문자 대신 널 문자를 출력합니다. c 플래그를 사용할 때 공백 또는 따옴표로 파일 이름 해석을 올바르게 할 수 있습니다. 이 플래그는 xargs(1) 옵션 C<-0> 또는 C<--null>을 함께 사용하십시오." #. type: =item -#: dos2unix.pod:299 +#: dos2unix.pod:309 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:301 +#: dos2unix.pod:311 msgid "Print number of DOS line breaks." msgstr "DOS 개행 문자를 출력합니다." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:313 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:315 msgid "Print number of Unix line breaks." msgstr "유닉스 개행 문자를 출력합니다." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:317 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:319 msgid "Print number of Mac line breaks." msgstr "맥 개행 문자를 출력합니다." #. type: =item -#: dos2unix.pod:311 +#: dos2unix.pod:321 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:323 msgid "Print the byte order mark." msgstr "바이트 순서 표시를 출력합니다." #. type: =item -#: dos2unix.pod:315 +#: dos2unix.pod:325 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:317 +#: dos2unix.pod:327 msgid "Print if file is text or binary." msgstr "파일의 텍스트 또는 이진 여부를 출력합니다." #. type: =item -#: dos2unix.pod:319 +#: dos2unix.pod:329 +msgid "B" +msgstr "B" + +#. type: textblock +#: dos2unix.pod:331 +msgid "Print the type of the line break of the last line, or C if there is none." +msgstr "행 마지막에 개행 문자 형식을 출력하거나, 없을 경우 C을 출력합니다." + +#. type: =item +#: dos2unix.pod:333 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:321 +#: dos2unix.pod:335 msgid "Print only the files that would be converted." msgstr "변환할 파일만 출력합니다." #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:337 msgid "With the C flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "dos2unix에 C 플래그를 사용하면 DOS 개행 문자가 들어간 파일만 출력합니다. unix2dos는 유닉스 개행 문자가 들어간 파일 이름만 출력합니다." +#. type: textblock +#: dos2unix.pod:340 +msgid "If in addition option C<-e> or C<--add-eol> is used also the files that lack a line break on the last line will be printed." +msgstr "C<-e> 또는 C<--add-eol> 옵션을 추가로 사용하면 행 마지막에 빠진 개행 문자를 출력합니다." + #. type: =item -#: dos2unix.pod:326 +#: dos2unix.pod:343 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:345 msgid "Print a header." msgstr "헤더를 출력합니다." #. type: =item -#: dos2unix.pod:330 +#: dos2unix.pod:347 msgid "B

" msgstr "B

" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:349 msgid "Show file names without path." msgstr "경로를 뺀 파일 이름을 나타냅니다." #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:353 msgid "Examples:" msgstr "예제:" #. type: textblock -#: dos2unix.pod:338 +#: dos2unix.pod:355 msgid "Show information for all *.txt files:" msgstr "모든 *.txt 파일 정보 출력:" #. type: verbatim -#: dos2unix.pod:340 +#: dos2unix.pod:357 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -555,12 +591,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:342 +#: dos2unix.pod:359 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "DOS 개행 문자와 유닉스 개행 문자 갯수만 출력:" #. type: verbatim -#: dos2unix.pod:344 +#: dos2unix.pod:361 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -570,12 +606,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:346 +#: dos2unix.pod:363 msgid "Show only the byte order mark:" msgstr "바이트 순서 표시만 나타내기:" #. type: verbatim -#: dos2unix.pod:348 +#: dos2unix.pod:365 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -585,12 +621,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:350 +#: dos2unix.pod:367 msgid "List the files that have DOS line breaks:" msgstr "DOS 개행 문자가 들어간 파일 목록 출력:" #. type: verbatim -#: dos2unix.pod:352 +#: dos2unix.pod:369 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -600,12 +636,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:354 +#: dos2unix.pod:371 msgid "List the files that have Unix line breaks:" msgstr "유닉스 개행 문자가 들어간 파일 목록 출력:" #. type: verbatim -#: dos2unix.pod:356 +#: dos2unix.pod:373 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -615,12 +651,27 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:358 +#: dos2unix.pod:375 +msgid "List the files that have DOS line breaks or lack a line break on the last line:" +msgstr "DOS 개행 문자가 들어갔거나 행 마지막에 개행 문자가 빠진 파일 목록 출력:" + +#. type: verbatim +#: dos2unix.pod:377 +#, no-wrap +msgid "" +" dos2unix -e -ic *.txt\n" +"\n" +msgstr "" +" dos2unix -e -ic *.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:379 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "DOS 개행 문자가 들어간 파일만 변환하며 다른 파일은 건드리지 않습니다:" #. type: verbatim -#: dos2unix.pod:360 +#: dos2unix.pod:381 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -630,12 +681,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:362 +#: dos2unix.pod:383 msgid "Find text files that have DOS line breaks:" msgstr "DOS 개행 문자가 들어간 텍스트 파일 찾기:" #. type: verbatim -#: dos2unix.pod:364 +#: dos2unix.pod:385 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -645,122 +696,122 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:366 +#: dos2unix.pod:387 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:368 +#: dos2unix.pod:389 msgid "Keep the date stamp of output file same as input file." msgstr "출력 파일의 날짜 스탬프는 입력 파일과 동일하게 설정합니다." #. type: =item -#: dos2unix.pod:370 +#: dos2unix.pod:391 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:372 +#: dos2unix.pod:393 msgid "Display program's license." msgstr "프로그램 라이선스를 표시합니다." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:395 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:397 msgid "Add additional newline." msgstr "부가 개행 문자를 추가합니다." #. type: textblock -#: dos2unix.pod:378 +#: dos2unix.pod:399 msgid "B: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B: DOS 개행 문자만을 유닉스 개행 문자 둘로 변환합니다. 맥 모드에서는 맥 개행 문자만을 유닉스 개행 문자 둘로 변환합니다." #. type: textblock -#: dos2unix.pod:382 +#: dos2unix.pod:403 msgid "B: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B: 유닉스 개행 문자만을 DOS 개행 문자 둘로 변환합니다. 맥 모드에서는 유닉스 개행 문자를 맥 개행 문자 둘로 변환합니다." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:406 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:408 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "바이트 순서 표시(BOM)를 출력 파일에 기록합니다. 기본적으로 UTF-8 BOM을 기록합니다." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:411 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "입력 파일 인코딩이 UTF-16이고 C<-u> 옵션을 사용했다면 UTF-16 BOM을 기록합니다." #. type: textblock -#: dos2unix.pod:393 +#: dos2unix.pod:414 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "출력 인코딩이 UTF-8, UTF-16, GB18030이 아니라면 이 옵션을 사용하지 마십시오. 유니코드 섹션도 참고하십시오." #. type: =item -#: dos2unix.pod:397 +#: dos2unix.pod:418 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<< -n, --newfile <입력파일> <출력파일> ... >>" #. type: textblock -#: dos2unix.pod:399 +#: dos2unix.pod:420 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I be used or you I lose your files." msgstr "새 파일 모드입니다. <입력파일>을 변환하여 <출력파일>에 기록합니다. 파일 이름은 짝으로 지정하며 와일드카드 이름은 사용하지 I<말아야> 하며, 그렇지 않으면 파일을 I<잃습니다>." #. type: textblock -#: dos2unix.pod:403 +#: dos2unix.pod:424 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "새 파일(짝)모드로 파일 변환을 시작한 사용자는 변환한 파일의 소유자가 됩니다. 새 파일의 읽기/쓰기 권한은 변환을 실행한 사용자의 umask(1)를 뺀 원본 파일의 권한으로 부여합니다." #. type: =item -#: dos2unix.pod:408 +#: dos2unix.pod:429 msgid "B<--no-allow-chown>" msgstr "B<--no-allow-chown>" #. type: textblock -#: dos2unix.pod:410 +#: dos2unix.pod:431 msgid "Don't allow file ownership change in old file mode (default)." msgstr "이전 파일 모드의 파일 소유권 변경을 허용하지 않습니다(기본값)." #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:433 msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." msgstr "원본 파일의 사용자 또는 그룹 소유권을 이전 파일 모드에서 유지할 수 없다면 변환을 멈춥니다. C<-o>, C<-n> 옵션도 참고하십시오. 이 옵션은 dos2unix에서 파일의 사용자 및 그룹 소유권을 유지하는 기능이 있을 경우에만 사용할 수 있습니다." #. type: =item -#: dos2unix.pod:417 +#: dos2unix.pod:438 msgid "B<--no-add-eol>" msgstr "B<--no-add-eol>" #. type: textblock -#: dos2unix.pod:419 +#: dos2unix.pod:440 msgid "Do not add a line break to the last line if there isn't one." msgstr "개행 문자가 줄 끝에 없을 경우 넣지 않습니다." #. type: =item -#: dos2unix.pod:421 +#: dos2unix.pod:442 msgid "B<-O, --to-stdout>" msgstr "B<-O, --to-stdout>" #. type: textblock -#: dos2unix.pod:423 +#: dos2unix.pod:444 msgid "Write to standard output, like a Unix filter. Use option C<-o> to go back to old file (in-place) mode." msgstr "유닉스 필터 동작과 비슷하게 표준 출력에 기록합니다. 이전 파일(기록) 모드로 돌아가려면 C<-o> 옵션을 사용합니다." #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:447 msgid "Combined with option C<-e> files can be properly concatenated. No merged last and first lines, and no Unicode byte order marks in the middle of the concatenated file. Example:" msgstr "C<-e> 옵션을 붙여 결합한 파일은 제대로 내용을 합칠 수 있습니다. 마지막 줄과 첫줄은 병합하지 않으며, 결합한 파일 내용 중간에 들어있는 유니코드 바이트 순서 표시는 들어가지 않습니다. 예를 들면:" #. type: verbatim -#: dos2unix.pod:430 +#: dos2unix.pod:451 #, no-wrap msgid "" " dos2unix -e -O file1.txt file2.txt > output.txt\n" @@ -770,32 +821,32 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:432 +#: dos2unix.pod:453 msgid "B<-o, --oldfile FILE ...>" msgstr "B<< -o, --oldfile <파일> ... >>" #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:455 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "이전 파일 모드. <파일>을 변환하고 출력을 <파일>에 덮어씁니다. 프로그램 기본값은 이 모드로의 실행입니다. 와일드카드 이름을 사용할 수도 있습니다." #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:458 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "이전 파일(자체 변환)모드에서 변환한 파일은 동일한 소유자, 그룹, 읽기 쓰기 권한을 원본 파일과 동일하게 유지합니다. 게다가 쓰기 권한이 있는 다른 사용자(예를 들어, root)가 파일을 변환했다 하더라도 마찬가지입니다. 원본 값을 그대로 유지할 수 없을 경우에는 변환을 멈춥니다. 소유권 변경이 가능하단건 곧 원본 소유자가 더이상 파일을 읽을 수 없음을 의미합니다. 소유그룹 변경은 원하지 않는 사용자가 파일을 읽게 할 수 있어 보안 문제를 야기할 수 있습니다. 소유자, 소유그룹, 읽기/쓰기 권한 유지는 유닉스에서만 지원합니다." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:467 msgid "To check if dos2unix has support for preserving the user and group ownership of files type C." msgstr "dos2unix에서 파일의 사용자 및 그룹 소유권을 유지하는 기능을 지원하는지 확인하려면 C를 입력하십시오." #. type: textblock -#: dos2unix.pod:449 +#: dos2unix.pod:470 msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" msgstr "변환 동작은 항상 임시 파일로 처리합니다. 변환 과정 도중 오류가 발생하면, 임시 파일을 삭제하고 원본 파일을 그대로 둡니다. 변환이 끝나면 원본 파일을 임시 파일로 바꿉니다. 실행한 사용자는 원본 파일의 쓰기 권한을 가지겠지만, 원본 파일처럼 임시 파일에 사용자 또는 그룹 소유권을 동일하게 부여할 수는 없습니다. 즉, 원본 파일의 사용자 또는 그룹 권한을 그대로 대상 파일에 설정할 수는 없단 뜻입니다. 이 경우 C<--allow-chown> 옵션을 사용하여 변환을 계속할 수 있습니다:" #. type: verbatim -#: dos2unix.pod:458 +#: dos2unix.pod:479 #, no-wrap msgid "" " dos2unix --allow-chown foo.txt\n" @@ -805,12 +856,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:460 +#: dos2unix.pod:481 msgid "Another option is to use new file mode:" msgstr "다른 옵션은 새 파일 모드에서 사용합니다:" #. type: verbatim -#: dos2unix.pod:462 +#: dos2unix.pod:483 #, no-wrap msgid "" " dos2unix -n foo.txt foo.txt\n" @@ -820,227 +871,227 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:485 msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." msgstr "C<--allow-chown> 옵션의 장점은 와일드 카드를 사용할 수 있으며, 가능하다면 소유관 속성을 유지합니다." #. type: =item -#: dos2unix.pod:467 +#: dos2unix.pod:488 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:469 +#: dos2unix.pod:490 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "미 출력 모드. 모든 경고와 메시지를 끕니다. 반환 값은 0입니다. 잘못된 명령행 옵션을 사용했을 때는 이 경우에서 제외합니다." #. type: =item -#: dos2unix.pod:472 +#: dos2unix.pod:493 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:495 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "바이트 순서 표시(BOM)를 제거합니다. BOM을 출력 파일에 기록하지 않습니다. 유닉스 개행 문자로 변환할 때 기본 동작입니다. C<-b> 옵션도 참고하십시오." #. type: =item -#: dos2unix.pod:478 +#: dos2unix.pod:499 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:501 msgid "Skip binary files (default)." msgstr "이진 파일은 건너뜁니다(기본값)." #. type: textblock -#: dos2unix.pod:482 +#: dos2unix.pod:503 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "이진 파일 건너뛰기는 갑작스런 실수를 피하는 동작입니다. 이진 파일 감시는 100% 실패 예방을 하지 않습니다. 입력 파일에서 텍스트 파일에서 보통 찾을 수 없는 이진 심볼을 검색합니다. 이진 파일에도 일반 텍스트 문자만 들어있을 수 있습니다. 이런 이진 파일 종류는 (그래서) 텍스트 파일로 실수로 알아챌 수 있습니다." #. type: =item -#: dos2unix.pod:488 +#: dos2unix.pod:509 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:490 +#: dos2unix.pod:511 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "입력의 UTF-16 인코딩 원본을 유지합니다. 원본 파일은 동일한 UTF-16 인코딩을 리틀엔디언 또는 빅엔디언으로 입력 파일과 같이 기록합니다. 이는 UTF-8로의 변환을 막습니다. UTF-16 BOM은 원본을 따라 대상에 기록합니다. 이 옵션 동작은 C<-ascii> 옵션으로 막을 수 있습니다." #. type: =item -#: dos2unix.pod:495 +#: dos2unix.pod:516 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:497 +#: dos2unix.pod:518 msgid "Assume that the input file format is UTF-16LE." msgstr "입력 파일 형식을 UTF-16LE로 가정합니다." #. type: textblock -#: dos2unix.pod:499 +#: dos2unix.pod:520 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "바이트 순서 표시가 입력 파일에 있다면 BOM은 이 옵션보다 우선순위를 갖습니다." #. type: textblock -#: dos2unix.pod:502 +#: dos2unix.pod:523 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "잘못된 가정(입력 파일이 UTF-16LE 형식이 아니라거나)하에 변환에 성공했다면, 잘못된 내용이 들어간 UTF-8 출력 파일을 받을 수 있습니다. iconf(1) 명령을 활용하여 UTF-8 출력 파일을 UTF-16LE로 되돌려 변환하는 방식으로 잘못된 변환 결과를 되돌릴 수 있습니다. 이런 방법으로 원본 파일을 되돌릴 수 있습니다." #. type: textblock -#: dos2unix.pod:507 +#: dos2unix.pod:528 msgid "The assumption of UTF-16LE works as a I. By switching to the default I mode the UTF-16LE assumption is turned off." msgstr "UTF-16LE가 I<변환 모드>로 동작한다고 가정해보겠습니다. 기본 I 모드로 전환하면 UTF-16LE에 대한 가정은 꺼진 상태입니다." #. type: =item -#: dos2unix.pod:510 +#: dos2unix.pod:531 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:512 +#: dos2unix.pod:533 msgid "Assume that the input file format is UTF-16BE." msgstr "입력 파일 형식을 UTF-16BE로 가정합니다." #. type: textblock -#: dos2unix.pod:514 +#: dos2unix.pod:535 msgid "This option works the same as option C<-ul>." msgstr "이 옵션은 C<-ul>과 동일한 동작을 수행합니다." #. type: =item -#: dos2unix.pod:516 +#: dos2unix.pod:537 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:518 +#: dos2unix.pod:539 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "자세한 메시지를 표시합니다. 추가로, 바이트 순서 표시 세부정보가 나타나며 변환 개행 문자가 나타납니다." #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:542 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:523 +#: dos2unix.pod:544 msgid "Follow symbolic links and convert the targets." msgstr "심볼릭 링크를 따라가서 대상을 변환합니다." #. type: =item -#: dos2unix.pod:525 +#: dos2unix.pod:546 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:527 +#: dos2unix.pod:548 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "심볼릭 링크를 변환 파일로 바꿉니다(원시 대상 파일은 바뀌지 않은 상태로 둡니다)." #. type: =item -#: dos2unix.pod:530 +#: dos2unix.pod:551 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:532 +#: dos2unix.pod:553 msgid "Keep symbolic links and targets unchanged (default)." msgstr "심볼릭 링크와 대상을 바뀌지 않게 그대로 둡니다(기본값)." #. type: =item -#: dos2unix.pod:534 +#: dos2unix.pod:555 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:536 +#: dos2unix.pod:557 msgid "Display version information and exit." msgstr "버전 정보를 표시하고 나갑니다." #. type: =head1 -#: dos2unix.pod:540 +#: dos2unix.pod:561 msgid "MAC MODE" msgstr "맥 모드" #. type: textblock -#: dos2unix.pod:542 -msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." -msgstr "일반 모드에서는 개행 문자를 DOS에서 유닉스로 그 반대로 변환합니다. 맥 개행 문자는 변환하지 않습니다." +#: dos2unix.pod:563 +msgid "By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." +msgstr "DOS 개행 문자와 유닉스 개행 문자를 서로 변환해주는 동작이 기본 동작이빈다. 맥 개행 문자는 변환하지 않습니다." #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:566 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "맥 모드에서 개행 문자를 맥에서 유닉스로, 내지는 그 반대로 변환합니다. DOS 개행 문자를 바꾸지 않습니다." #. type: textblock -#: dos2unix.pod:548 +#: dos2unix.pod:569 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C or C." msgstr "맥 모드를 실행하려면 C<-c mac> 명령행 옵션을 사용하거나 C 명령 또는 C 명령을 사용하십시오." #. type: =head1 -#: dos2unix.pod:551 +#: dos2unix.pod:572 msgid "CONVERSION MODES" msgstr "변환 모드" #. type: =item -#: dos2unix.pod:555 +#: dos2unix.pod:576 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:557 -msgid "In mode C only line breaks are converted. This is the default conversion mode." -msgstr "C 모드에서는 개행 문자만 변환합니다. ASCII 모드는 기본 변환 모드입니다." +#: dos2unix.pod:578 +msgid "This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling B mode disables B<7bit> and B mode." +msgstr "기본 변환 모드입니다. 이 모드는 아스키와 UTF-8과 같은 아스키 호환 인코딩 파일을 변환합니다. B 모드를 활성화하면 B<7bit> 모드와 B 모드를 사용하지 않습니다." #. type: textblock -#: dos2unix.pod:560 -msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." -msgstr "7비트 표준 모드를 ASCII 라고 칭하지만 실제 모드는 8 비트입니다. 유니코드 UTF-8 파일을 변환할 때 항상 이 모드를 사용하십시오." +#: dos2unix.pod:582 +msgid "If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has UTF-16 support type C. See also section UNICODE." +msgstr "dos2unix에서 UTF-16을 지원하면 UTF-16 인코딩 파일을 POSIX 시스템의 현재 로캘 문자 인코딩과 윈도우의 UTF-8 인코딩으로 변환합니다. B 모드를 사용하면 UTF-16 인코딩 (C)을 유지하는 옵션과 UTF-16 입력(C<-ul> 및 C<-ub>)을 가정하는 옵션 값을 사용하지 않습니다. dos2unix에 UTF-16 을 지원하는지 알아보려면 C를 입력하십시오. 유니코드 섹션도 살펴보십시오." #. type: =item -#: dos2unix.pod:564 +#: dos2unix.pod:588 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:566 +#: dos2unix.pod:590 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." -msgstr "이 모드에서는 ASCII 영역 밖(128~255 값)의 모든 8비트 문자를 7비트 영역으로 변환합니다." +msgstr "이 모드에서는 아스키 영역 밖(128~255 값)의 모든 8비트 문자를 7비트 영역으로 변환합니다." #. type: =item -#: dos2unix.pod:569 +#: dos2unix.pod:593 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:571 +#: dos2unix.pod:595 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "DOS 문자 세트(코드 페이지)에서 유닉스 ISO 문자 세트 ISO-8859-1(Latin1)로 또는 그 반대로 문자를 변환합니다. ISO-8859-1에 대응하지 않는 DOS 문자는 변환할 수 없어 구두점으로 변환합니다. ISO-8859-1에서 DOS 문자 세트로 변환할 때도 마찬가지입니다." #. type: textblock -#: dos2unix.pod:576 +#: dos2unix.pod:600 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "dos2unix에 C<-iso>옵션만 사용했을 경우 활성 코드 페이지 확인을 시도합니다. 불가능하다면 dos2unix는 미합중국에서 주로 사용하는 CP437 기본 코드 페이지를 사용합니다. 코드 페이지를 강제로 지정하려면 C<-437> (US), C<-850> (서유럽어), C<-860> (포르투갈어), C<-863> (캐나다 프랑스어), C<-865> (북유럽어) 옵션 중 하나를 사용하십시오. 윈도우 코드 페이지 CP1252 (서유럽어)는 C<-1252> 옵션으로 지원합니다. 다른 코드 페이지를 활용하려면 dos2unix와 iconv(1)를 함께 사용하십시오. iconv는 다양한 문자 인코딩을 변환할 수 있습니다." #. type: textblock -#: dos2unix.pod:585 +#: dos2unix.pod:609 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "유니코드 텍스트 파일을 ISO 방식으로 변환하지 마십시오. UTF-8 인코딩 파일이 깨집니다." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:611 msgid "Some examples:" msgstr "일부 예제:" #. type: textblock -#: dos2unix.pod:589 +#: dos2unix.pod:613 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "DOS 기본 코드 페이지에서 유닉스 Latin-1으로 변환:" #. type: verbatim -#: dos2unix.pod:591 +#: dos2unix.pod:615 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -1050,12 +1101,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:593 +#: dos2unix.pod:617 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "DOS CP850에서 유닉스 Latin-1으로 변환:" #. type: verbatim -#: dos2unix.pod:595 +#: dos2unix.pod:619 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -1065,12 +1116,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:597 +#: dos2unix.pod:621 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "윈도우 CP1252에서 유닉스 Latin-1으로 변환:" #. type: verbatim -#: dos2unix.pod:599 +#: dos2unix.pod:623 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -1080,12 +1131,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:601 +#: dos2unix.pod:625 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "윈도우 CP1252에서 유닉스 UTF-8(유니코드)로 변환:" #. type: verbatim -#: dos2unix.pod:603 +#: dos2unix.pod:627 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -1095,12 +1146,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:605 +#: dos2unix.pod:629 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "유닉스 Latin-1에서 DOS 기본 코드 페이지로 변환:" #. type: verbatim -#: dos2unix.pod:607 +#: dos2unix.pod:631 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -1110,12 +1161,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:609 +#: dos2unix.pod:633 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "유닉스 Latin-1에서 DOS CP850으로 변환:" #. type: verbatim -#: dos2unix.pod:611 +#: dos2unix.pod:635 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1125,12 +1176,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:637 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "유닉스 Latin-1에서 윈도우 CP1252로 변환:" #. type: verbatim -#: dos2unix.pod:615 +#: dos2unix.pod:639 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1140,12 +1191,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:617 +#: dos2unix.pod:641 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "유닉스 UTF-8(유니코드)에서 윈도우 CP1252로 변환:" #. type: verbatim -#: dos2unix.pod:619 +#: dos2unix.pod:643 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1155,142 +1206,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:621 +#: dos2unix.pod:645 msgid "See also L and L." msgstr "L 링크와 L 링크도 참고하십시오." #. type: =head1 -#: dos2unix.pod:626 +#: dos2unix.pod:650 msgid "UNICODE" msgstr "유니코드" #. type: =head2 -#: dos2unix.pod:628 +#: dos2unix.pod:652 msgid "Encodings" msgstr "인코딩" #. type: textblock -#: dos2unix.pod:630 +#: dos2unix.pod:654 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "여러가지 유니코드 인코딩이 있습니다. 유닉스와 리뉵스 유니코드 파일은 보통 UTF-8 인코딩 방식으로 인코딩합니다. 윈도우에서는 유니코드 텍스트 파일을 UTF-8, UTF-16, UTF-16 빅엔디언 방식으로 인코딩할 수 있지만 보통 UTF-16 형식으로 인코딩합니다." #. type: =head2 -#: dos2unix.pod:635 +#: dos2unix.pod:659 msgid "Conversion" msgstr "변환" #. type: textblock -#: dos2unix.pod:637 -msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." -msgstr "유니코드 텍스트 파일에는 DOS, 유닉스, 맥 개행 문자를 일반 텍스트 파일처럼 가질 수 있습니다." +#: dos2unix.pod:661 +msgid "Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files." +msgstr "유니코드 텍스트 파일에는 DOS, 유닉스, 맥 개행 문자를 아스키 텍스트 파일처럼 가질 수 있습니다." #. type: textblock -#: dos2unix.pod:640 +#: dos2unix.pod:664 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." -msgstr "dos2unix와 unix2dos의 모든 버전에서는 UTF-8이 ASCII와의 하위 호환성을 고려했기 때문에 UTF-8 인코딩 파일을 변환할 수 있습니다." +msgstr "dos2unix와 unix2dos의 모든 버전에서는 UTF-8이 아스키와의 하위 호환성을 고려했기 때문에 UTF-8 인코딩 파일을 변환할 수 있습니다." #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:667 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C." msgstr "UTF-16을 지원하는 dos2unix와 unix2dos는 UTF-16 리틀엔디언 및 빅엔디언 인코딩 텍스트 파일을 모두 읽을 수 있습니다. dos2unix에 UTF-16 지원 기능이 들어갔는지 확인하려면 C 명령을 입력하십시오." #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:671 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "유닉스/리눅스에서 UTF-16 인코딩 파일은 로캘 문자 인코딩으로 변환합니다. 어떤 로캘 문자 인코딩을 사용했는지 확인하려면 locale(1) 명령을 사용하십시오. 변환이 불가능할 경우 변환 오류가 나타나며, 해당 파일을 건너뜁니다." #. type: textblock -#: dos2unix.pod:652 +#: dos2unix.pod:676 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "윈도우에서 UTF-16 파일은 기본적으로 UTF-8로 변환합니다. UTF-8 형식 텍스트 파일은 윈도우, 유닉스, 리눅스에서 잘 읽힙니다." #. type: textblock -#: dos2unix.pod:655 +#: dos2unix.pod:679 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "UTF-16과 UTF-8 인코딩은 완전한 호환 관계이며, 변환 과정에 잃을 내용은 없습니다. UTF-16에서 UTF-8로 변환하던 중 오류가 나타났다면, 예를 들어 UTF-16 파일에 오류가 있다면, 해당 파일을 건너뜁니다." #. type: textblock -#: dos2unix.pod:659 +#: dos2unix.pod:683 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "C<-u> 옵션을 사용하면 입력 파일의 UTF-16 인코딩을 출력 파일에도 그대로 적용합니다. C<-u> 옵션은 UTF-8로의 변환을 막습니다." #. type: textblock -#: dos2unix.pod:662 +#: dos2unix.pod:686 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "dos2unix와 unix2dos에는 UTF-8 파일을 UTF-16으로 변환하는 옵션이 없습니다." #. type: textblock -#: dos2unix.pod:664 +#: dos2unix.pod:688 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "ISO 및 7비트 모드 변환은 UTF-16 파일에 동작하지 않습니다." #. type: =head2 -#: dos2unix.pod:666 +#: dos2unix.pod:690 msgid "Byte Order Mark" msgstr "바이트 순서 표시(BOM)" #. type: textblock -#: dos2unix.pod:668 -msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." -msgstr "윈도우에서는 유니코드 텍스트 파일에 대부분 윈도우 프로그램(메모장 포함)에서 BOM을 기본으로 추가하기 때문에 보통 바이트 순서 표시(BOM)가 들어갑니다. L 링크를 참고하십시오." +#: dos2unix.pod:692 +msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." +msgstr "윈도우에서는 유니코드 텍스트 파일에 대부분 윈도우 프로그램(메모장 포함)에서 BOM을 기본으로 추가하기 때문에 보통 바이트 순서 표시(BOM)가 들어갑니다. L 링크를 참고하십시오." #. type: textblock -#: dos2unix.pod:672 +#: dos2unix.pod:696 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "유닉스에서는 유니코드 파일에 BOM이 들어가지 않습니다. 텍스트 파일을 로캘 문자 인코딩으로 인코딩했다고 가정합니다." #. type: textblock -#: dos2unix.pod:675 +#: dos2unix.pod:699 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "dos2unix는 UTF-16 형식인지, BOM이 들어갔는지만 알 수 있습니다. UTF-16 파일에 BOM이 없다면 dos2unix는 이진 파일로 인식합니다." #. type: textblock -#: dos2unix.pod:679 +#: dos2unix.pod:703 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "UTF-16 파일을 BOM을 빼고 변환하려면 C<-ul> 옵션 또는 C<-ub> 옵션을 사용하십시오." #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:705 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "dos2unix에서는 기본적으로 출력 파일에 BOM을 기록하지 않습니다. 입력 파일에 BOM이 있다면 dos2unix에 C<-b> 옵션을 지정했을 때 출력 파일에 BOM을 기록합니다." #. type: textblock -#: dos2unix.pod:684 +#: dos2unix.pod:708 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "unix2dos에서는 기본적으로 입력 파일에 BOM이 있다면 출력 파일에 BOM을 기록합니다. BOM을 제거하려면 C<-r> 옵션을 사용하십시오." #. type: textblock -#: dos2unix.pod:687 +#: dos2unix.pod:711 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "dos2unix와 unix2dos는 C<-m> 옵션을 사용하면 항상 BOM을 기록합니다." #. type: =head2 -#: dos2unix.pod:689 +#: dos2unix.pod:713 msgid "Unicode file names on Windows" msgstr "윈도우의 유니코드 파일 이름" #. type: textblock -#: dos2unix.pod:691 +#: dos2unix.pod:715 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C." msgstr "dos2unix에서는 윈도우 명령 프롬프트의 유니코드 파일 이름을 읽고 쓰는 추가 기능을 지원합니다. dos2unix에서 기본 시스템 ANSI 코드 페이지의 일부가 아닌 문자가 들어간 이름일지라도 파일을 열 수 있다는 뜻입니다. 윈도우용 dos2unix에 유니코드 파일 이름 지원 기능이 들어있는지 확인하려면 C 명령을 입력하십시오." #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:721 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "윈도우 콘솔에 유니코드 파일 이름을 표시할 때 몇가지 문제가 있습니다. C<-D>, C<--display-enc> 옵션을 참고하십시오. 콘솔에서 파일 이름이 잘못 나타날 수는 있지만 파일은 (어쨌든) 올바른 이름으로 기록합니다." #. type: =head2 -#: dos2unix.pod:701 +#: dos2unix.pod:725 msgid "Unicode examples" msgstr "유니코드 예제" #. type: textblock -#: dos2unix.pod:703 +#: dos2unix.pod:727 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "윈도우 UTF-16(+BOM)을 유닉스 UTF-8로 변환:" #. type: verbatim -#: dos2unix.pod:705 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1300,12 +1351,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:731 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "윈도우 UTF-16LE(-BOM)를 유닉스 UTF-8로 변환:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:733 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1315,12 +1366,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:735 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "유닉스 UTF-8을 윈도우 UTF-8(+BOM)로 변환:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:737 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1330,12 +1381,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:739 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "유닉스 UTF-8을 윈도우 UTF-16으로 변환:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:741 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1345,47 +1396,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:719 +#: dos2unix.pod:743 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:721 -msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." -msgstr "GB18030은 중화인민공화국 정부 표준입니다. GB18030 표준 하위 필수 세트는 중화인민공화국에서 판매하는 모든 프로그램 제품에 공식적으로 필요합니다. L 링크를 참고하십시오." +#: dos2unix.pod:745 +msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." +msgstr "GB18030은 중화인민공화국 정부 표준입니다. GB18030 표준 하위 필수 세트는 중화인민공화국에서 판매하는 모든 프로그램 제품에 공식적으로 필요합니다. L 링크를 참고하십시오." #. type: textblock -#: dos2unix.pod:725 +#: dos2unix.pod:749 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." -msgstr "GB18030은 유니코드와 완벽하게 호환하며, 유니코드 변환 형식으로 고려할 수 있습니다. UTF-8과 유사하게, GB18030은 ASCII와 호환성을 지닙니다. GB18030은 또한 GBK로 알려진 윈도우 코드 페이지 936과도 호환성이 있습니다." +msgstr "GB18030은 유니코드와 완벽하게 호환하며, 유니코드 변환 형식으로 고려할 수 있습니다. UTF-8과 유사하게, GB18030은 아스키와 호환성을 지닙니다. GB18030은 또한 GBK로 알려진 윈도우 코드 페이지 936과도 호환성이 있습니다." #. type: textblock -#: dos2unix.pod:729 +#: dos2unix.pod:753 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C to get the list of supported locales." msgstr "유닉스/리눅스에서 UTF-16 파일은 로캘 인코딩을 GB18030으로 설정하면 GB18030으로 변환합니다. 참고로 시스템에서 해당 로캘을 지원할 경우에만 동작합니다. 지원 로캘 목록을 살펴보려면 C 명령을 사용하십시오." #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:757 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "윈도우에서는 UTF-16 파일을 GB18030으로 변환하려면 C<-gb> 옵션을 사용해야합니다." #. type: textblock -#: dos2unix.pod:735 +#: dos2unix.pod:759 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "GB18030 인코딩 파일에는 유니코드 파일처럼 바이트 순서 표시가 들어갈 수 있습니다." #. type: =head1 -#: dos2unix.pod:737 +#: dos2unix.pod:761 msgid "EXAMPLES" msgstr "예제" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:763 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "'표준 입력'을 읽어 '표준 출력'에 출력:" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:765 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1397,12 +1448,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:744 +#: dos2unix.pod:768 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "a.txt를 변환하고 내용 바꾸기. b.txt를 변환하고 내용 바꾸기:" #. type: verbatim -#: dos2unix.pod:746 +#: dos2unix.pod:770 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1414,12 +1465,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:749 +#: dos2unix.pod:773 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "a.txt를 아스키 변환 모드로 변환하고 내용 바꾸기:" #. type: verbatim -#: dos2unix.pod:751 +#: dos2unix.pod:775 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1429,12 +1480,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:753 +#: dos2unix.pod:777 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "a.txt를 아스키 변환 모드로 변환하고 내용 바꾸기, b.txt를 7비트 변환 모드로 변환하고 내용 바꾸기:" #. type: verbatim -#: dos2unix.pod:756 +#: dos2unix.pod:780 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1448,12 +1499,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:760 +#: dos2unix.pod:784 msgid "Convert a.txt from Mac to Unix format:" msgstr "a.txt를 맥 형식에서 유닉스 형식으로 변환:" #. type: verbatim -#: dos2unix.pod:762 +#: dos2unix.pod:786 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1465,12 +1516,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:765 +#: dos2unix.pod:789 msgid "Convert a.txt from Unix to Mac format:" msgstr "a.txt를 유닉스 형시에서 맥 형식으로 변환:" #. type: verbatim -#: dos2unix.pod:767 +#: dos2unix.pod:791 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1482,12 +1533,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:770 +#: dos2unix.pod:794 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "a.txt의 날짜 스탬프를 유지하며 변환하고 내용 바꾸기:" #. type: verbatim -#: dos2unix.pod:772 +#: dos2unix.pod:796 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1499,12 +1550,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:775 +#: dos2unix.pod:799 msgid "Convert a.txt and write to e.txt:" msgstr "a.txt를 변환하여 e.txt로 기록:" #. type: verbatim -#: dos2unix.pod:777 +#: dos2unix.pod:801 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1514,12 +1565,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:779 +#: dos2unix.pod:803 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "a.txt를 변환하고 e.txt로 기록, e.txt의 날짜 스탬프를 a.txt와 동일하게 설정:" #. type: verbatim -#: dos2unix.pod:781 +#: dos2unix.pod:805 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1529,12 +1580,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:783 +#: dos2unix.pod:807 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "a.txt를 변환하고 내용 바꾸기, b.txt를 변환하고 e.txt에 기록:" #. type: verbatim -#: dos2unix.pod:785 +#: dos2unix.pod:809 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1546,12 +1597,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:788 +#: dos2unix.pod:812 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "a.txt를 변환하여 e.txt로 기록, a.txt를 변환하고 내용 바꾸기, b.txt를 변환하고 내용 바꾸기, d.txt를 변환하고 f.txt로 기록:" #. type: verbatim -#: dos2unix.pod:791 +#: dos2unix.pod:815 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1561,17 +1612,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:793 +#: dos2unix.pod:817 msgid "RECURSIVE CONVERSION" msgstr "재귀 변환" #. type: textblock -#: dos2unix.pod:795 +#: dos2unix.pod:819 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "유닉스 셸에서 dos2unix로 하여금 디렉터리 트리의 모든 텍스트 파일을 재귀적으로 탐색하여 처리하려 할 때, find(1)와 xargs(1) 명령을 사용할 수 있습니다. 예를 들어 아래 형태를 갖춘 디렉터리 트리의 모든 .txt 파일을 변환하려면:" #. type: verbatim -#: dos2unix.pod:799 +#: dos2unix.pod:823 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1581,12 +1632,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:801 +#: dos2unix.pod:825 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "find(1) 명령의 옵션 C<-print0> 그리고 이에 해당하는 xargs(1) 명령의 C<-0>옵션은 이름에 공백이나 따옴표가 있을 경우 필요합니다. 공백이나 따옴표가 없으면 이 옵션을 생략할 수 있습니다. 다른 옵션으로는 find(1)의 C<-exec> 옵션이 있습니다:" #. type: verbatim -#: dos2unix.pod:805 +#: dos2unix.pod:829 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1596,12 +1647,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:807 +#: dos2unix.pod:831 msgid "In a Windows Command Prompt the following command can be used:" msgstr "윈도우 명령 프롬프트에서 다음 명령을 활용할 수 없습니다:" #. type: verbatim -#: dos2unix.pod:809 +#: dos2unix.pod:833 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1611,12 +1662,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:811 +#: dos2unix.pod:835 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "파워셸 사용자는 윈도우 파워셸에서 다음 명령을 활용할 수 있습니다:" #. type: verbatim -#: dos2unix.pod:813 +#: dos2unix.pod:837 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1626,23 +1677,23 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:816 +#: dos2unix.pod:840 msgid "LOCALIZATION" msgstr "지역화" # NOTE: 환경변수 이름이므로 변환하지 말것 #. type: =item -#: dos2unix.pod:820 +#: dos2unix.pod:844 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:822 +#: dos2unix.pod:846 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "기본 언어는 LANG 환경 변수로 선택합니다. LANG 환경 변수는 몇가지 부분으로 구성합니다. 첫번째 부분은 언어 코드를 의미하는 몇가지 문자입니다. 두번제 부분은 대문자로 이루어진 국가 코드입니다. 두 코드 사이에는 밑줄 문자가 들어갑니다. 마지막으로 추가하는 부분은 점이 앞서 오는 문자 인코딩입니다. POSIX 표준 형 셸에서 몇가지 예제를 보여드리도록 하겠습니다:" #. type: verbatim -#: dos2unix.pod:829 +#: dos2unix.pod:853 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1664,49 +1715,49 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:837 -msgid "For a complete list of language and country codes see the gettext manual: L" -msgstr "언어 및 국가 코드 전체 목록을 보려면 L gettext 설명서를 참고하십시오" +#: dos2unix.pod:861 +msgid "For a complete list of language and country codes see the gettext manual: L" +msgstr "언어 및 국가 코드 전체 목록을 보려면 L gettext 설명서를 참고하십시오" #. type: textblock -#: dos2unix.pod:840 +#: dos2unix.pod:864 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "유닉스 시스템에서는 locale(1) 명령을 활용하여 로캘별 정보를 가져올 수 있습니다." # NOTE: 환경변수 이름이므로 변환하지 말것 #. type: =item -#: dos2unix.pod:843 +#: dos2unix.pod:867 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:845 -msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" -msgstr "LANGUAGE 환경 변수에는 언어를 우선 순위별로 콜론으로 구분하여 지정할 수 있습니다. dos2unix에서는 LANGUAGE를 LANG보다 우선하여 취급합니다. 예를 들면 네덜란드어를 먼저 그 다음에 독일어를 설정할 경우 C(으)로 설정합니다. LANGUAGE 환경 변수에 언어별 우선 순위를 두어 사용할 수 있기 전에 LANG 환경 변수에 \"C\" 대신 다른 값을 넣어 지역화를 우선 설정해야합니다. L gettext 설명서를 참고하십시오" +#: dos2unix.pod:869 +msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" +msgstr "LANGUAGE 환경 변수에는 언어를 우선 순위별로 콜론으로 구분하여 지정할 수 있습니다. dos2unix에서는 LANGUAGE를 LANG보다 우선하여 취급합니다. 예를 들면 네덜란드어를 먼저 그 다음에 독일어를 설정할 경우 C(으)로 설정합니다. LANGUAGE 환경 변수에 언어별 우선 순위를 두어 사용할 수 있기 전에 LANG 환경 변수에 \"C\" 대신 다른 값을 넣어 지역화를 우선 설정해야합니다. L gettext 설명서를 참고하십시오" #. type: textblock -#: dos2unix.pod:853 +#: dos2unix.pod:877 msgid "If you select a language which is not available you will get the standard English messages." msgstr "사용할 수 없는 언어를 선택했다면 표준 (국제) 영어 메시지로 나타납니다." # NOTE: 환경변수 이름이므로 변환하지 말것 #. type: =item -#: dos2unix.pod:857 +#: dos2unix.pod:881 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:859 +#: dos2unix.pod:883 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C. Option B<--version> will display the LOCALEDIR that is used." msgstr "DOS2UNIX_LOCALEDIR 환경 변수는, 컴파일 시간에는 LOCALEDIR 환경 변수를 우선 활용할 수 있습니다. LOCALEDIR 환경 변수는 언어 파일을 찾을 때 활용합니다. GNU 기본값은 C입니다. B<--version> 옵션을 사용하면 LOCALEDIR이 사용하는 값을 보여줍니다." #. type: textblock -#: dos2unix.pod:864 +#: dos2unix.pod:888 msgid "Example (POSIX shell):" msgstr "예제 (POSIX 셸):" #. type: verbatim -#: dos2unix.pod:866 +#: dos2unix.pod:890 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1716,71 +1767,80 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:871 +#: dos2unix.pod:895 msgid "RETURN VALUE" msgstr "반환 값" #. type: textblock -#: dos2unix.pod:873 +#: dos2unix.pod:897 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "성공하면 0값을 반환합니다. 시스템 오류가 나타나면 가장 마지막에 나타난 시스템 오류를 반환합니다. 다른 오류는 1 값을 반환합니다." #. type: textblock -#: dos2unix.pod:876 +#: dos2unix.pod:900 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "미출력 모드의 반환 값은 항상 0이지만, 명령행 옵션이 잘못됐을 경우는 제외합니다." #. type: =head1 -#: dos2unix.pod:879 +#: dos2unix.pod:903 msgid "STANDARDS" msgstr "표준" #. type: textblock -#: dos2unix.pod:881 -msgid "L" -msgstr "L" +#: dos2unix.pod:905 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:883 -msgid "L" -msgstr "L" +#: dos2unix.pod:907 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:885 -msgid "L" -msgstr "L" +#: dos2unix.pod:909 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:887 -msgid "L" -msgstr "L" +#: dos2unix.pod:911 +msgid "L" +msgstr "L" #. type: =head1 -#: dos2unix.pod:889 +#: dos2unix.pod:913 msgid "AUTHORS" msgstr "저자" #. type: textblock -#: dos2unix.pod:891 +#: dos2unix.pod:915 msgid "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer)" msgstr "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer)" #. type: textblock -#: dos2unix.pod:896 -msgid "Project page: L" -msgstr "프로젝트 페이지: L" +#: dos2unix.pod:920 +msgid "Project page: L" +msgstr "프로젝트 페이지: L" #. type: textblock -#: dos2unix.pod:898 -msgid "SourceForge page: L" -msgstr "SourceForge 페이지: L" +#: dos2unix.pod:922 +msgid "SourceForge page: L" +msgstr "SourceForge 페이지: L" #. type: =head1 -#: dos2unix.pod:900 +#: dos2unix.pod:924 msgid "SEE ALSO" msgstr "추가 참조" #. type: textblock -#: dos2unix.pod:902 +#: dos2unix.pod:926 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" + +#~ msgid "Convert only line breaks. This is the default conversion mode." +#~ msgstr "줄 바꿈 문자만 변환합니다. 기본 변환 모드입니다." + +#~ msgid "In mode C only line breaks are converted. This is the default conversion mode." +#~ msgstr "C 모드에서는 개행 문자만 변환합니다. ASCII 모드는 기본 변환 모드입니다." + +#~ msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." +#~ msgstr "7비트 표준 모드를 ASCII 라고 칭하지만 실제 모드는 8 비트입니다. 유니코드 UTF-8 파일을 변환할 때 항상 이 모드를 사용하십시오." diff --git a/dos2unix/po-man/nl.po b/dos2unix/po-man/nl.po index ce59223..7f8ff02 100644 --- a/dos2unix/po-man/nl.po +++ b/dos2unix/po-man/nl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix-man-7.3.6-beta4\n" -"POT-Creation-Date: 2023-04-20 22:32+0200\n" +"POT-Creation-Date: 2023-11-27 21:39+0100\n" "PO-Revision-Date: 2020-09-27 16:25+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" @@ -149,8 +149,10 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:121 -msgid "Convert only line breaks. This is the default conversion mode." -msgstr "Alleen regeleindes converteren. Dit is de standaardconversiemodus." +#, fuzzy +#| msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES." +msgid "Default conversion mode. See also section CONVERSION MODES." +msgstr "Conversie tussen de tekensets DOS en ISO-8859-1. Zie ook de sectie B." #. type: =item #: dos2unix.pod:123 @@ -405,7 +407,7 @@ msgid "The following information is printed, in this order: number of DOS line b msgstr "De volgende informatie wordt weergegeven, in deze volgorde: het aantal DOS-regeleindes, het aantal Unix-regeleindes, het aantal Mac-regeleindes, de Byte-Order-Mark, of het een tekst- of binair bestand is, en de bestandsnaam." #. type: textblock -#: dos2unix.pod:274 +#: dos2unix.pod:274 dos2unix.pod:290 msgid "Example output:" msgstr "Voorbeelduitvoer:" @@ -440,116 +442,166 @@ msgstr "Merk op dat een binair bestand soms voor een tekstbestand aangezien kan #. type: textblock #: dos2unix.pod:287 +msgid "If in addition option C<-e> or C<--add-eol> is used also the type of the line break of the last line is printed, or C if there is none." +msgstr "" + +#. type: verbatim +#: dos2unix.pod:292 +#, fuzzy, no-wrap +#| msgid "" +#| " 6 0 0 no_bom text dos.txt\n" +#| " 0 6 0 no_bom text unix.txt\n" +#| " 0 0 6 no_bom text mac.txt\n" +#| " 6 6 6 no_bom text mixed.txt\n" +#| " 50 0 0 UTF-16LE text utf16le.txt\n" +#| " 0 50 0 no_bom text utf8unix.txt\n" +#| " 50 0 0 UTF-8 text utf8dos.txt\n" +#| " 2 418 219 no_bom binary dos2unix.exe\n" +#| "\n" +msgid "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" +msgstr "" +" 6 0 0 no_bom text dos.txt\n" +" 0 6 0 no_bom text unix.txt\n" +" 0 0 6 no_bom text mac.txt\n" +" 6 6 6 no_bom text mixed.txt\n" +" 50 0 0 UTF-16LE text utf16le.txt\n" +" 0 50 0 no_bom text utf8unix.txt\n" +" 50 0 0 UTF-8 text utf8dos.txt\n" +" 2 418 219 no_bom binary dos2unix.exe\n" +"\n" + +#. type: textblock +#: dos2unix.pod:297 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Bij de optie kunnen één of meer vlaggen meegegeven worden om de uitvoer te beperken." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:302 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:304 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "" #. type: =item -#: dos2unix.pod:299 +#: dos2unix.pod:309 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:301 +#: dos2unix.pod:311 msgid "Print number of DOS line breaks." msgstr "Het aantal DOS-regeleindes tonen." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:313 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:315 msgid "Print number of Unix line breaks." msgstr "Het aantal Unix-regeleindes tonen." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:317 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:319 msgid "Print number of Mac line breaks." msgstr "Het aantal Mac-regeleindes tonen." #. type: =item -#: dos2unix.pod:311 +#: dos2unix.pod:321 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:323 msgid "Print the byte order mark." msgstr "De Byte-Order-Mark tonen." #. type: =item -#: dos2unix.pod:315 +#: dos2unix.pod:325 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:317 +#: dos2unix.pod:327 msgid "Print if file is text or binary." msgstr "Tonen of het bestand tekst is of binair." #. type: =item -#: dos2unix.pod:319 +#: dos2unix.pod:329 +msgid "B" +msgstr "" + +#. type: textblock +#: dos2unix.pod:331 +msgid "Print the type of the line break of the last line, or C if there is none." +msgstr "" + +#. type: =item +#: dos2unix.pod:333 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:321 +#: dos2unix.pod:335 msgid "Print only the files that would be converted." msgstr "Alleen de namen tonen van de bestanden die geconverteerd zouden worden." #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:337 msgid "With the C flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Met de vlag C toont dos2unix alleen de bestanden die DOS-regeleindes bevatten, en unix2dos alleen de bestanden die Unix-regeleindes bevatten." +#. type: textblock +#: dos2unix.pod:340 +msgid "If in addition option C<-e> or C<--add-eol> is used also the files that lack a line break on the last line will be printed." +msgstr "" + #. type: =item -#: dos2unix.pod:326 +#: dos2unix.pod:343 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:345 msgid "Print a header." msgstr "Een kopregel printen." #. type: =item -#: dos2unix.pod:330 +#: dos2unix.pod:347 msgid "B

" msgstr "B

" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:349 msgid "Show file names without path." msgstr "Bestandsnamen tonen zonder pad." #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:353 msgid "Examples:" msgstr "Voorbeelden:" #. type: textblock -#: dos2unix.pod:338 +#: dos2unix.pod:355 msgid "Show information for all *.txt files:" msgstr "Informatie weergeven voor alle bestanden met de extensie 'txt':" #. type: verbatim -#: dos2unix.pod:340 +#: dos2unix.pod:357 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -559,12 +611,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:342 +#: dos2unix.pod:359 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Alleen de aantallen DOS-regeleindes en Unix-regeleindes tonen:" #. type: verbatim -#: dos2unix.pod:344 +#: dos2unix.pod:361 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -574,12 +626,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:346 +#: dos2unix.pod:363 msgid "Show only the byte order mark:" msgstr "Alleen de Byte-Order-Mark tonen:" #. type: verbatim -#: dos2unix.pod:348 +#: dos2unix.pod:365 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -589,12 +641,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:350 +#: dos2unix.pod:367 msgid "List the files that have DOS line breaks:" msgstr "De bestanden opsommen die DOS-regeleindes bevatten:" #. type: verbatim -#: dos2unix.pod:352 +#: dos2unix.pod:369 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -604,12 +656,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:354 +#: dos2unix.pod:371 msgid "List the files that have Unix line breaks:" msgstr "De bestanden opsommen die Unix-regeleindes bevatten:" #. type: verbatim -#: dos2unix.pod:356 +#: dos2unix.pod:373 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -619,12 +671,32 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:358 +#: dos2unix.pod:375 +#, fuzzy +#| msgid "List the files that have DOS line breaks:" +msgid "List the files that have DOS line breaks or lack a line break on the last line:" +msgstr "De bestanden opsommen die DOS-regeleindes bevatten:" + +#. type: verbatim +#: dos2unix.pod:377 +#, fuzzy, no-wrap +#| msgid "" +#| " dos2unix -ic *.txt\n" +#| "\n" +msgid "" +" dos2unix -e -ic *.txt\n" +"\n" +msgstr "" +" dos2unix -ic *.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:379 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "Alleen bestanden die DOS-regeleindes bevatten converteren en andere bestanden ongemoeid laten:" #. type: verbatim -#: dos2unix.pod:360 +#: dos2unix.pod:381 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -634,12 +706,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:362 +#: dos2unix.pod:383 msgid "Find text files that have DOS line breaks:" msgstr "De bestanden vinden die DOS-regeleindes bevatten:" #. type: verbatim -#: dos2unix.pod:364 +#: dos2unix.pod:385 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -649,126 +721,126 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:366 +#: dos2unix.pod:387 msgid "B<-k, --keepdate>" msgstr "B<-k>, B<--keepdate>" #. type: textblock -#: dos2unix.pod:368 +#: dos2unix.pod:389 msgid "Keep the date stamp of output file same as input file." msgstr "Het tijdsstempel van het invoerbestand behouden voor het uitvoerbestand." #. type: =item -#: dos2unix.pod:370 +#: dos2unix.pod:391 msgid "B<-L, --license>" msgstr "B<-L>, B<--license>" #. type: textblock -#: dos2unix.pod:372 +#: dos2unix.pod:393 msgid "Display program's license." msgstr "De softwarelicentie tonen." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:395 msgid "B<-l, --newline>" msgstr "B<-l>, B<--newline>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:397 msgid "Add additional newline." msgstr "Een extra regeleinde toevoegen." #. type: textblock -#: dos2unix.pod:378 +#: dos2unix.pod:399 msgid "B: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B: Alleen DOS-regeleindes worden omgezet naar twee Unix-regeleindes. In Mac-modus worden alleen Mac-regeleindes omgezet naar twee Unix-regeleindes." #. type: textblock -#: dos2unix.pod:382 +#: dos2unix.pod:403 msgid "B: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B: Alleen Unix-regeleindes worden omgezet naar twee DOS-regeleindes. In Mac-modus worden Unix-regeleindes omgezet naar twee Mac-regeleindes." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:406 msgid "B<-m, --add-bom>" msgstr "B<-m>, B<--add-bom>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:408 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "Een Byte-Order-Mark (BOM) naar het uitvoerbestand schrijven. Standaard wordt een UTF-8-BOM geschreven." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:411 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "Als het invoerbestand in UTF-16 is, en de optie C<-u> is gegeven, dan wordt een UTF-16-BOM geschreven." #. type: textblock -#: dos2unix.pod:393 +#: dos2unix.pod:414 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "Gebruik deze optie nooit als de codering van het uitvoerbestand niet UTF-8, UTF-16, of GB18030 is. Zie ook de sectie B." #. type: =item -#: dos2unix.pod:397 +#: dos2unix.pod:418 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n>, B<--newfile INVOERBESTAND UITVOERBESTAND> ..." #. type: textblock -#: dos2unix.pod:399 +#: dos2unix.pod:420 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I be used or you I lose your files." msgstr "Nieuw-bestand-modus. Het bestand INVOERBESTAND converteren en naar bestand UITVOERBESTAND schrijven. Bestandsnamen moeten opgegeven worden in paren. Jokertekens moeten Igebruikt worden, anders I je de bestanden." #. type: textblock -#: dos2unix.pod:403 +#: dos2unix.pod:424 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "De gebruiker die de conversie start in nieuw-bestand (gepaarde) modus wordt de eigenaar van het geconverteerde bestand. De lees/schrijf-toegangsrechten van het nieuwe bestand worden de toegangsrechten van het originele bestand minus de umask(1) van de gebruiker die de conversie draait." #. type: =item -#: dos2unix.pod:408 +#: dos2unix.pod:429 msgid "B<--no-allow-chown>" msgstr "B<--no-allow-chown>" #. type: textblock -#: dos2unix.pod:410 +#: dos2unix.pod:431 msgid "Don't allow file ownership change in old file mode (default)." msgstr "Wijziging van bestandseigenaar niet toestaan in oud-bestand-modus (standaard)." #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:433 msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." msgstr "" #. type: =item -#: dos2unix.pod:417 +#: dos2unix.pod:438 #, fuzzy #| msgid "B<-m, --add-bom>" msgid "B<--no-add-eol>" msgstr "B<-m>, B<--add-bom>" #. type: textblock -#: dos2unix.pod:419 +#: dos2unix.pod:440 msgid "Do not add a line break to the last line if there isn't one." msgstr "" #. type: =item -#: dos2unix.pod:421 +#: dos2unix.pod:442 #, fuzzy #| msgid "B<-q, --quiet>" msgid "B<-O, --to-stdout>" msgstr "B<-q>, B<--quiet>" #. type: textblock -#: dos2unix.pod:423 +#: dos2unix.pod:444 msgid "Write to standard output, like a Unix filter. Use option C<-o> to go back to old file (in-place) mode." msgstr "" #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:447 msgid "Combined with option C<-e> files can be properly concatenated. No merged last and first lines, and no Unicode byte order marks in the middle of the concatenated file. Example:" msgstr "" #. type: verbatim -#: dos2unix.pod:430 +#: dos2unix.pod:451 #, fuzzy, no-wrap #| msgid "" #| " dos2unix -ul -n in.txt out.txt\n" @@ -781,34 +853,34 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:432 +#: dos2unix.pod:453 #, fuzzy #| msgid "B<-o, --oldfile FILE ...>" msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o>, B<--oldfile BESTAND> ..." #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:455 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "Oud-bestand-modus. Het bestand BESTAND converteren en overschrijven. Dit is de standaard modus. Jokertekens kunnen gebruikt worden." #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:458 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "In oud-bestand (vervangende) modus krijgt het geconverteerde bestand dezelfde eigenaar, groep en lees/schrijf-rechten als het originele bestand. Ook wanneer het bestand wordt omgezet door een andere gebruiker die schrijfrechten heeft op het bestand (b.v. gebruiker root). De omzetting wordt afgebroken wanneer het niet mogelijk is de originele waardes te behouden. Verandering van eigenaar kan betekenen dat de originele eigenaar het bestand niet meer kan lezen. Verandering van groep zou een veiligheidsrisico kunnen zijn, het bestand zou leesbaar kunnen worden voor personen voor wie het niet bestemd is. Behoud van eigenaar, groep en lees/schrijf-rechten wordt alleen ondersteund op Unix." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:467 msgid "To check if dos2unix has support for preserving the user and group ownership of files type C." msgstr "Om te controleren of dos2unix ondersteuning heeft voor het behouden van de gebruiker en de groep van bestanden, typt u C." #. type: textblock -#: dos2unix.pod:449 +#: dos2unix.pod:470 msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" msgstr "" #. type: verbatim -#: dos2unix.pod:458 +#: dos2unix.pod:479 #, no-wrap msgid "" " dos2unix --allow-chown foo.txt\n" @@ -818,12 +890,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:460 +#: dos2unix.pod:481 msgid "Another option is to use new file mode:" msgstr "Een andere mogelijkheid is het gebruiken van nieuw-bestand-modus:" #. type: verbatim -#: dos2unix.pod:462 +#: dos2unix.pod:483 #, no-wrap msgid "" " dos2unix -n foo.txt foo.txt\n" @@ -833,227 +905,229 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:485 msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." msgstr "Het voordeel van optie C<--allow-chown> is dat u jokertekens kunt gebruiken, en dat dan de eigenaarseigenschappen waar mogelijk behouden zullen blijven." #. type: =item -#: dos2unix.pod:467 +#: dos2unix.pod:488 msgid "B<-q, --quiet>" msgstr "B<-q>, B<--quiet>" #. type: textblock -#: dos2unix.pod:469 +#: dos2unix.pod:490 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Stille werking. Alle waarschuwingen onderdrukken. De afsluitwaarde is nul, behalve wanneer verkeerde opties worden gegeven." #. type: =item -#: dos2unix.pod:472 +#: dos2unix.pod:493 msgid "B<-r, --remove-bom>" msgstr "B<-r>, B<--remove-bom>" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:495 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "Een Byte-Order-Mark (BOM) verwijderen. Er wordt geen BOM naar het uitvoerbestand geschreven. Dit is het standaardgedrag bij conversie naar Unix. Zie ook optie C<-b>." #. type: =item -#: dos2unix.pod:478 +#: dos2unix.pod:499 msgid "B<-s, --safe>" msgstr "B<-s>, B<--safe>" #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:501 msgid "Skip binary files (default)." msgstr "Binaire bestanden overslaan (standaard)." #. type: textblock -#: dos2unix.pod:482 +#: dos2unix.pod:503 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "Binaire bestanden worden overgeslagen om vergissingen te voorkomen. Het detecteren van binaire bestanden is echter niet 100% betrouwbaar. Invoerbestanden worden gescand op binaire tekens die gewoonlijk niet in tekstbestanden voorkomen. Maar het is mogelijk dat een binair bestand enkel normale teksttekens bevat. Zo'n binair bestand zal dan foutief als een tekstbestand gezien worden." #. type: =item -#: dos2unix.pod:488 +#: dos2unix.pod:509 msgid "B<-u, --keep-utf16>" msgstr "B<-u>, B<--keep-utf16>" #. type: textblock -#: dos2unix.pod:490 +#: dos2unix.pod:511 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "De originele UTF-16-codering van het invoerbestand behouden. Het uitvoerbestand wordt in dezelfde UTF-16-codering (little endian of big endian) geschreven als het invoerbestand. Dit voorkomt conversie naar UTF-8. Er wordt ook een corresponderende UTF-16-BOM geschreven. Deze optie kan uitgeschakeld worden met de optie C<-ascii>." #. type: =item -#: dos2unix.pod:495 +#: dos2unix.pod:516 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul>, B<--assume-utf16le>" #. type: textblock -#: dos2unix.pod:497 +#: dos2unix.pod:518 msgid "Assume that the input file format is UTF-16LE." msgstr "Veronderstellen dat de indeling van het invoerbestand UTF-16LE is." #. type: textblock -#: dos2unix.pod:499 +#: dos2unix.pod:520 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "Wanneer het invoerbestand een Byte-Order-Mark (BOM) bevat, dan gaat deze BOM vóór deze optie." #. type: textblock -#: dos2unix.pod:502 +#: dos2unix.pod:523 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "Wanneer een verkeerde aanname is gemaakt (het invoerbestand was geen UTF-16LE) en de conversie verliep met succes, dan krijgt u een UTF-8-bestand met verkeerde tekst. De verkeerde conversie kan ongedaan worden gemaakt door met iconv(1) het UTF-8-uitvoerbestand terug om te zetten naar UTF-16LE. Dit zal het originele bestand terug brengen." #. type: textblock -#: dos2unix.pod:507 +#: dos2unix.pod:528 msgid "The assumption of UTF-16LE works as a I. By switching to the default I mode the UTF-16LE assumption is turned off." msgstr "De aanname van UTF-16LE werkt als een I. Door de standaardmodus I in te schakelen wordt de UTF-16LE-veronderstelling uitgeschakeld." #. type: =item -#: dos2unix.pod:510 +#: dos2unix.pod:531 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub>, B<--assume-utf16be>" #. type: textblock -#: dos2unix.pod:512 +#: dos2unix.pod:533 msgid "Assume that the input file format is UTF-16BE." msgstr "Veronderstellen dat de indeling van het invoerbestand UTF-16BE is." #. type: textblock -#: dos2unix.pod:514 +#: dos2unix.pod:535 msgid "This option works the same as option C<-ul>." msgstr "Deze optie werkt hetzelfde als optie C<-ul>." #. type: =item -#: dos2unix.pod:516 +#: dos2unix.pod:537 msgid "B<-v, --verbose>" msgstr "B<-v>, B<--verbose>" #. type: textblock -#: dos2unix.pod:518 +#: dos2unix.pod:539 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "Extra meldingen weergeven. Er wordt extra informatie getoond over Byte-Order-Marks en het aantal geconverteerde regeleindes." #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:542 msgid "B<-F, --follow-symlink>" msgstr "B<-F>, B<--follow-symlink>" #. type: textblock -#: dos2unix.pod:523 +#: dos2unix.pod:544 msgid "Follow symbolic links and convert the targets." msgstr "Symbolische koppelingen volgen en de doelen converteren." #. type: =item -#: dos2unix.pod:525 +#: dos2unix.pod:546 msgid "B<-R, --replace-symlink>" msgstr "B<-R>, B<--replace-symlink>" #. type: textblock -#: dos2unix.pod:527 +#: dos2unix.pod:548 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "Symbolische koppelingen vervangen door geconverteerde bestanden (de originele doelbestanden blijven ongewijzigd)." #. type: =item -#: dos2unix.pod:530 +#: dos2unix.pod:551 msgid "B<-S, --skip-symlink>" msgstr "B<-S>, B<--skip-symlink>" #. type: textblock -#: dos2unix.pod:532 +#: dos2unix.pod:553 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Symbolische koppelingen en doelen ongewijzigd laten (standaard)." #. type: =item -#: dos2unix.pod:534 +#: dos2unix.pod:555 msgid "B<-V, --version>" msgstr "B<-V>, B<--version>" #. type: textblock -#: dos2unix.pod:536 +#: dos2unix.pod:557 msgid "Display version information and exit." msgstr "Versie-informatie tonen." #. type: =head1 -#: dos2unix.pod:540 +#: dos2unix.pod:561 msgid "MAC MODE" msgstr "MAC-MODUS" #. type: textblock -#: dos2unix.pod:542 -msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." +#: dos2unix.pod:563 +#, fuzzy +#| msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." +msgid "By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." msgstr "In normale modus worden DOS-regeleindes naar Unix omgezet en vice versa. Mac-regeleindes worden niet omgezet." #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:566 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "In Mac-modus worden Mac-regeleindes naar Unix omgezet en vice versa. DOS-regeleindes blijven ongewijzigd." #. type: textblock -#: dos2unix.pod:548 +#: dos2unix.pod:569 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C or C." msgstr "Om in Mac-modus te draaien kunt u de opdrachtregeloptie C<-c mac> gebruiken, of de opdrachten C of C." #. type: =head1 -#: dos2unix.pod:551 +#: dos2unix.pod:572 msgid "CONVERSION MODES" msgstr "CONVERSIEMODI" #. type: =item -#: dos2unix.pod:555 +#: dos2unix.pod:576 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:557 -msgid "In mode C only line breaks are converted. This is the default conversion mode." -msgstr "In modus C worden alleen regeleindes omgezet. Dit is de standaardmodus." +#: dos2unix.pod:578 +msgid "This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling B mode disables B<7bit> and B mode." +msgstr "" #. type: textblock -#: dos2unix.pod:560 -msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." -msgstr "Hoewel de naam van deze modus ASCII is, wat een 7-bits standaard is, is de werkelijke modus 8-bits. Gebruik altijd deze modus wanneer u Unicode UTF-8-bestanden omzet." +#: dos2unix.pod:582 +msgid "If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has UTF-16 support type C. See also section UNICODE." +msgstr "" #. type: =item -#: dos2unix.pod:564 +#: dos2unix.pod:588 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:566 +#: dos2unix.pod:590 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "Alle 8-bits niet-ASCII lettertekens (met waardes van 128 t/m 255) worden omgezet naar een 7-bits spatie." #. type: =item -#: dos2unix.pod:569 +#: dos2unix.pod:593 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:571 +#: dos2unix.pod:595 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Tekens worden omgezet tussen een DOS-tekenset (codetabel) en de ISO-tekenset ISO-8859-1 (Latin-1) op Unix. DOS-tekens zonder een ISO-8859-1-equivalent, waarvoor dus geen omzetting mogelijk is, worden omgezet in een punt. Hetzelfde geldt voor ISO-8859-1-tekens zonder DOS-tegenhanger." #. type: textblock -#: dos2unix.pod:576 +#: dos2unix.pod:600 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "Wanneer alleen optie C<-iso> gebruikt wordt, zal dos2unix proberen de actieve codetabel te gebruiken. Als dat niet mogelijk is wordt codetabel CP437 gebruikt, die vooral in de VS gebruikt wordt. Om een bepaalde codetabel te forceren, kunt u de opties C<-850> (West-Europees), C<-860> (Portugees), C<-863> (Canadees Frans) of C<-865> (Scandinavisch) gebruiken. Windows-codetabel CP1252 (West-Europees) wordt ook ondersteund met optie C<-1252>. Gebruik voor andere codetabellen dos2unix in combinatie met iconv(1). Iconv kan omzetten tussen een lange lijst tekensetcoderingen." #. type: textblock -#: dos2unix.pod:585 +#: dos2unix.pod:609 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "Gebruik ISO-conversie nooit op Unicode-tekstbestanden. Het zal UTF-8-gecodeerde bestanden beschadigen." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:611 msgid "Some examples:" msgstr "Enkele voorbeelden:" #. type: textblock -#: dos2unix.pod:589 +#: dos2unix.pod:613 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Omzetten van de standaard DOS-codetabel naar Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:591 +#: dos2unix.pod:615 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -1063,12 +1137,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:593 +#: dos2unix.pod:617 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Omzetten van DOS CP850 naar Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:595 +#: dos2unix.pod:619 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -1078,12 +1152,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:597 +#: dos2unix.pod:621 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Omzetten van Windows CP1252 naar Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:599 +#: dos2unix.pod:623 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -1093,12 +1167,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:601 +#: dos2unix.pod:625 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Omzetten van Windows CP1252 naar Unix UTF-8 (Unicode):" #. type: verbatim -#: dos2unix.pod:603 +#: dos2unix.pod:627 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -1108,12 +1182,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:605 +#: dos2unix.pod:629 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Omzetten van Unix Latin-1 naar de standaard DOS-codetabel:" #. type: verbatim -#: dos2unix.pod:607 +#: dos2unix.pod:631 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -1123,12 +1197,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:609 +#: dos2unix.pod:633 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Omzetten van Unix Latin-1 naar DOS CP850:" #. type: verbatim -#: dos2unix.pod:611 +#: dos2unix.pod:635 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1138,12 +1212,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:637 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Omzetten van Unix Latin-1 naar Windows CP1252:" #. type: verbatim -#: dos2unix.pod:615 +#: dos2unix.pod:639 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1153,12 +1227,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:617 +#: dos2unix.pod:641 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Omzetten van Unix UTF-8 (Unicode) naar Windows CP1252:" #. type: verbatim -#: dos2unix.pod:619 +#: dos2unix.pod:643 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1168,142 +1242,146 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:621 +#: dos2unix.pod:645 msgid "See also L and L." msgstr "Zie ook L en L." #. type: =head1 -#: dos2unix.pod:626 +#: dos2unix.pod:650 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:628 +#: dos2unix.pod:652 msgid "Encodings" msgstr "Coderingen" #. type: textblock -#: dos2unix.pod:630 +#: dos2unix.pod:654 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Er bestaan verschillende Unicode-coderingen. Op Unix en Linux zijn Unicode-bestanden typisch gecodeerd in UTF-8. Op Windows kunnen Unicode-tekstbestanden gecodeerd zijn in UTF-8, UTF-16 of UTF-16 big endian, maar ze zijn meestal gecodeerd in UTF-16." #. type: =head2 -#: dos2unix.pod:635 +#: dos2unix.pod:659 msgid "Conversion" msgstr "Conversie" #. type: textblock -#: dos2unix.pod:637 -msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." +#: dos2unix.pod:661 +#, fuzzy +#| msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." +msgid "Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files." msgstr "Unicode-tekstbestanden kunnen DOS-, Unix- of Mac-regeleindes hebben, net als reguliere tekstbestanden." #. type: textblock -#: dos2unix.pod:640 +#: dos2unix.pod:664 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Alle versies van dos2unix en unix2dos kunnen UTF-8-gecodeerde bestanden omzetten, want UTF-8 is ontworpen op compatibiliteit met ASCII." #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:667 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C." msgstr "Dos2unix en unix2dos met Unicode UTF-16-ondersteuning kunnen little en big endian UTF-16-gecodeerde tekstbestanden lezen. Om er achter te komen of dos2unix gebouwd is met UTF-16- ondersteuning, typt u C." #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:671 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "Op Unix/Linux worden UTF-16-bestanden geconverteerd naar de codering van de ingestelde taalregio. Gebruik de opdracht B(1) om te zien wat de ingestelde codering is. Wanneer conversie niet mogelijk is, treedt er een fout op en wordt het bestand overgeslagen." #. type: textblock -#: dos2unix.pod:652 +#: dos2unix.pod:676 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "Op Windows worden UTF-16-bestanden standaard naar UTF-8 geconverteerd. UTF-8-tekstbestanden worden alom goed ondersteund, zowel op Windows als Unix/Linux." #. type: textblock -#: dos2unix.pod:655 +#: dos2unix.pod:679 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "De UTF-16- en UTF-8-coderingen zijn volledig compatibel, er gaat bij het converteren niets verloren. Als er tijdens de conversie van UTF-16 naar UTF-8 een fout optreedt, bijvoorbeeld omdat het UTF-16-invoerbestand een fout bevat, dan wordt het bestand overgeslagen." #. type: textblock -#: dos2unix.pod:659 +#: dos2unix.pod:683 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "Wanneer C<-u> gebruikt wordt, wordt het uitvoerbestand in dezelfde UTF-16-codering geschreven als het invoerbestand. Optie C<-u> voorkomt conversie naar UTF-8." #. type: textblock -#: dos2unix.pod:662 +#: dos2unix.pod:686 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "Dos2unix en unix2dos hebben geen optie om van UTF-8 naar UTF-16 te converteren." #. type: textblock -#: dos2unix.pod:664 +#: dos2unix.pod:688 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "ISO- en 7-bits-conversie werken niet op UTF-16-bestanden." #. type: =head2 -#: dos2unix.pod:666 +#: dos2unix.pod:690 msgid "Byte Order Mark" msgstr "Byte-Order-Mark" #. type: textblock -#: dos2unix.pod:668 -msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." +#: dos2unix.pod:692 +#, fuzzy +#| msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." +msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." msgstr "Op Windows bevatten Unicode-tekstbestanden gewoonlijk een Byte-Order-Mark (BOM), omdat veel Windows-programma's (inclusief Kladblok) standaard een BOM toevoegen. Zie ook L." #. type: textblock -#: dos2unix.pod:672 +#: dos2unix.pod:696 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "Op Unix hebben Unicode-tekstbestanden meestal geen BOM. Er wordt aangenomen dat de codering van tekstbestanden gelijk is aan de tekencodering van de ingestelde taalregio." #. type: textblock -#: dos2unix.pod:675 +#: dos2unix.pod:699 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "Dos2unix kan alleen detecteren of een bestand in UTF-16-codering is als het bestand een BOM bevat. Wanneer een UTF-16-bestand geen BOM heeft, ziet dos2unix het bestand als een binair bestand." #. type: textblock -#: dos2unix.pod:679 +#: dos2unix.pod:703 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Gebruik optie C<-ul> of C<-ub> om een UTF-16-bestand zonder BOM om te zetten." #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:705 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "Dos2unix schrijft standaard geen BOM in het uitvoerbestand. Met optie C<-b> schrijft dos2unix een BOM wanneer het invoerbestand een BOM bevat." #. type: textblock -#: dos2unix.pod:684 +#: dos2unix.pod:708 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "Unix2dos schrijft standaard een BOM in het uitvoerbestand wanneer het invoerbestand een BOM bevat. Gebruik optie C<-r> om de BOM te verwijderen." #. type: textblock -#: dos2unix.pod:687 +#: dos2unix.pod:711 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "Dos2unix en unix2dos schrijven altijd een BOM wanneer optie C<-m> gebruikt wordt." #. type: =head2 -#: dos2unix.pod:689 +#: dos2unix.pod:713 msgid "Unicode file names on Windows" msgstr "Unicode-bestandsnamen op Windows" #. type: textblock -#: dos2unix.pod:691 +#: dos2unix.pod:715 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C." msgstr "Dos2unix heeft optionele ondersteuning voor het lezen en schrijven van Unicode-bestandsnamen in de Windows Opdrachtprompt. Dit betekent dat dos2unix bestanden kan openen waarvan de naam tekens bevat die niet voorkomen in de standaard ANSI-codetabel. Om te zien of dos2unix voor Windows gecompileerd werd met ondersteuning voor Unicode-bestandsnamen, typt u C." #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:721 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "Er zijn enige problemen met het weergeven van Unicode-bestandsnamen in een Windows-console; zie bij optie C<-D>, C<--display-enc>. De bestandsnamen kunnen verkeerd weergegeven worden, maar de bestanden zullen geschreven worden met de correcte naam." #. type: =head2 -#: dos2unix.pod:701 +#: dos2unix.pod:725 msgid "Unicode examples" msgstr "Unicode-voorbeelden" #. type: textblock -#: dos2unix.pod:703 +#: dos2unix.pod:727 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Omzetten van Windows UTF-16 (met BOM) naar Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:705 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1313,12 +1391,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:731 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Omzetten van Windows UTF-16LE (zonder BOM) naar Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:733 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1328,12 +1406,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:735 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Omzetten van Unix UTF-8 naar Windows UTF-8 met BOM:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:737 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1343,12 +1421,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:739 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Omzetten van Unix UTF-8 naar Windows UTF-16:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:741 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1358,47 +1436,49 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:719 +#: dos2unix.pod:743 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:721 -msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." +#: dos2unix.pod:745 +#, fuzzy +#| msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." +msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." msgstr "GB18030 is een standaard van de Chinese overheid. Een subset van de GB18030-standaard is officieel verplicht voor alle softwareproducten die in China verkocht worden. Zie ook L." #. type: textblock -#: dos2unix.pod:725 +#: dos2unix.pod:749 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "GB18030 is volledig compatibel met Unicode, en kan als een Unicodetransformatie beschouwd worden. Net als UTF-8 is GB18030 compatibel met ASCII. GB18030 is ook compatibel met Windows-codetabel 936 (ook wel GBK genoemd)." #. type: textblock -#: dos2unix.pod:729 +#: dos2unix.pod:753 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C to get the list of supported locales." msgstr "Op Unix/Linux worden UTF-16-bestanden naar GB18030 geconverteerd wanneer de taalregio-codering GB18030 is. Merk op dat dit alleen werkt als deze taalregio-instelling door het systeem ondersteund wordt. Gebruik het commando C voor een overzicht van de beschikbare taalregio's." #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:757 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "Op Windows dient u de optie C<-gb> te gebruiken om UTF-16-bestanden naar GB18030 te converteren." #. type: textblock -#: dos2unix.pod:735 +#: dos2unix.pod:759 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "GB18030-bestanden kunnen een Byte-Order-Mark bevatten, net als Unicode-bestanden." #. type: =head1 -#: dos2unix.pod:737 +#: dos2unix.pod:761 msgid "EXAMPLES" msgstr "VOORBEELDEN" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:763 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Invoer lezen van standaardinvoer en uitvoer schrijven naar standaarduitvoer:" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:765 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1410,12 +1490,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:744 +#: dos2unix.pod:768 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "Omzetten en vervangen van a.txt; omzetten en vervangen van b.txt:" #. type: verbatim -#: dos2unix.pod:746 +#: dos2unix.pod:770 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1427,12 +1507,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:749 +#: dos2unix.pod:773 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "Omzetten en vervangen van a.txt in ascii-conversiemodus:" #. type: verbatim -#: dos2unix.pod:751 +#: dos2unix.pod:775 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1442,12 +1522,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:753 +#: dos2unix.pod:777 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "Omzetten en vervangen van a.txt in ascii-conversiemodus; omzetten en vervangen van b.txt in 7-bits conversiemodus:" #. type: verbatim -#: dos2unix.pod:756 +#: dos2unix.pod:780 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1461,12 +1541,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:760 +#: dos2unix.pod:784 msgid "Convert a.txt from Mac to Unix format:" msgstr "Omzetten van a.txt van Mac- naar Unix-indeling:" #. type: verbatim -#: dos2unix.pod:762 +#: dos2unix.pod:786 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1478,12 +1558,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:765 +#: dos2unix.pod:789 msgid "Convert a.txt from Unix to Mac format:" msgstr "Omzetten van a.txt van Unix- naar Mac-indeling:" #. type: verbatim -#: dos2unix.pod:767 +#: dos2unix.pod:791 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1495,12 +1575,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:770 +#: dos2unix.pod:794 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "Omzetten en vervangen van a.txt met behoud van origineel tijdsstempel:" #. type: verbatim -#: dos2unix.pod:772 +#: dos2unix.pod:796 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1512,12 +1592,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:775 +#: dos2unix.pod:799 msgid "Convert a.txt and write to e.txt:" msgstr "Omzetten van a.txt en resultaat naar e.txt schrijven:" #. type: verbatim -#: dos2unix.pod:777 +#: dos2unix.pod:801 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1527,12 +1607,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:779 +#: dos2unix.pod:803 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "Omzetten van a.txt en naar e.txt schrijven, met tijdsstempel van e.txt gelijk aan die van a.txt:" #. type: verbatim -#: dos2unix.pod:781 +#: dos2unix.pod:805 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1542,12 +1622,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:783 +#: dos2unix.pod:807 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "Omzetten en vervangen van a.txt; omzetten van b.txt en naar e.txt schrijven:" #. type: verbatim -#: dos2unix.pod:785 +#: dos2unix.pod:809 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1559,12 +1639,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:788 +#: dos2unix.pod:812 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "Omzetten van c.txt en naar e.txt schrijven; omzetten en vervangen van a.txt; omzetten en vervangen van b.txt; omzetten van d.txt en naar f.txt schrijven." #. type: verbatim -#: dos2unix.pod:791 +#: dos2unix.pod:815 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1574,18 +1654,18 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:793 +#: dos2unix.pod:817 msgid "RECURSIVE CONVERSION" msgstr "RECURSIEVE CONVERSIE" #. type: textblock -#: dos2unix.pod:795 +#: dos2unix.pod:819 #, fuzzy msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "Gebruik dos2unix in combinatie met de opdrachten B(1) en B(1) om tekstbestanden in een mappenboom recursief om te zetten. Bijvoorbeeld om alle .txt-bestanden in de mappenboom onder de huidige map te converteren, typt u:" #. type: verbatim -#: dos2unix.pod:799 +#: dos2unix.pod:823 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1595,12 +1675,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:801 +#: dos2unix.pod:825 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "" #. type: verbatim -#: dos2unix.pod:805 +#: dos2unix.pod:829 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1610,12 +1690,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:807 +#: dos2unix.pod:831 msgid "In a Windows Command Prompt the following command can be used:" msgstr "In een Windows Opdrachtprompt kan de volgende opdracht gebruikt worden:" #. type: verbatim -#: dos2unix.pod:809 +#: dos2unix.pod:833 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1625,12 +1705,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:811 +#: dos2unix.pod:835 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "" #. type: verbatim -#: dos2unix.pod:813 +#: dos2unix.pod:837 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1638,22 +1718,22 @@ msgid "" msgstr "" #. type: =head1 -#: dos2unix.pod:816 +#: dos2unix.pod:840 msgid "LOCALIZATION" msgstr "LOKALISATIE" #. type: =item -#: dos2unix.pod:820 +#: dos2unix.pod:844 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:822 +#: dos2unix.pod:846 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "De primaire taal wordt geselecteerd via de omgevingsvariabele LANG. De variabele LANG bestaat uit verschillende onderdelen. Het eerste deel is in kleine letters de taalcode. Het tweede deel is optioneel en is de landcode in hoofdletters, voorafgegaan door een liggend streepje. Er is ook een optioneel derde deel: de tekencodering, voorafgegaan door een punt. Enkele voorbeelden voor een POSIX-shell:" #. type: verbatim -#: dos2unix.pod:829 +#: dos2unix.pod:853 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1675,47 +1755,51 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:837 -msgid "For a complete list of language and country codes see the gettext manual: L" +#: dos2unix.pod:861 +#, fuzzy +#| msgid "For a complete list of language and country codes see the gettext manual: L" +msgid "For a complete list of language and country codes see the gettext manual: L" msgstr "Voor een complete lijst van taal- en landcodes zie de gettext-handleiding: L" #. type: textblock -#: dos2unix.pod:840 +#: dos2unix.pod:864 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "Op Unix-systemen kunt u de opdracht B(1) gebruiken om specifieke taalregio-informatie te verkrijgen." #. type: =item -#: dos2unix.pod:843 +#: dos2unix.pod:867 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:845 -msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" +#: dos2unix.pod:869 +#, fuzzy +#| msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" +msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" msgstr "Met de omgevingsvariabele LANGUAGE kunt u een prioriteitenlijst specificeren van talen, gescheiden door dubbele punten. Dos2unix geeft voorrang aan LANGUAGE boven LANG. Bijvoorbeeld, eerst Nederlands en dan Duits: C. U moet eerst lokalisatie in werking stellen, door het instellen van LANG (of LC_ALL) op een waarde ongelijk aan \"C\", voordat u een talen-prioriteitenlijst kunt gebruiken via de variabele LANGUAGE. Zie ook de gettext-handleiding: L" #. type: textblock -#: dos2unix.pod:853 +#: dos2unix.pod:877 msgid "If you select a language which is not available you will get the standard English messages." msgstr "Als u een taal kiest die niet beschikbaar is, worden de standaard Engelse berichten gebruikt." #. type: =item -#: dos2unix.pod:857 +#: dos2unix.pod:881 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:859 +#: dos2unix.pod:883 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C. Option B<--version> will display the LOCALEDIR that is used." msgstr "Met de omgevingsvariabele DOS2UNIX_LOCALEDIR kan de LOCALEDIR die ingesteld werd tijdens compilatie worden overstemd. LOCALEDIR wordt gebruikt om de taalbestanden te vinden. De GNU standaardwaarde is C. De optie B<--version> laat de gebruikte LOCALEDIR zien." #. type: textblock -#: dos2unix.pod:864 +#: dos2unix.pod:888 msgid "Example (POSIX shell):" msgstr "Voorbeeld (POSIX-shell):" #. type: verbatim -#: dos2unix.pod:866 +#: dos2unix.pod:890 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1725,75 +1809,98 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:871 +#: dos2unix.pod:895 msgid "RETURN VALUE" msgstr "AFSLUITWAARDE" #. type: textblock -#: dos2unix.pod:873 +#: dos2unix.pod:897 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "Bij succes wordt nul teruggegeven. Wanneer een systeemfout optreedt wordt het laatste systeemfoutnummer teruggegeven. Bij andere fouten wordt 1 teruggegeven." #. type: textblock -#: dos2unix.pod:876 +#: dos2unix.pod:900 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "De afsluitwaarde is altijd nul in de stillewerkingsmodus, behalve wanneer verkeerde opties worden gegeven." #. type: =head1 -#: dos2unix.pod:879 +#: dos2unix.pod:903 msgid "STANDARDS" msgstr "STANDAARDEN" #. type: textblock -#: dos2unix.pod:881 -msgid "L" +#: dos2unix.pod:905 +#, fuzzy +#| msgid "L" +msgid "L" msgstr "L" #. type: textblock -#: dos2unix.pod:883 -msgid "L" +#: dos2unix.pod:907 +#, fuzzy +#| msgid "L" +msgid "L" msgstr "L" #. type: textblock -#: dos2unix.pod:885 -msgid "L" +#: dos2unix.pod:909 +#, fuzzy +#| msgid "L" +msgid "L" msgstr "L" #. type: textblock -#: dos2unix.pod:887 -msgid "L" +#: dos2unix.pod:911 +#, fuzzy +#| msgid "L" +msgid "L" msgstr "" #. type: =head1 -#: dos2unix.pod:889 +#: dos2unix.pod:913 msgid "AUTHORS" msgstr "AUTEURS" #. type: textblock -#: dos2unix.pod:891 +#: dos2unix.pod:915 msgid "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer)" msgstr "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix-modus) - , Christian Wurll (toevoegen van extra regeleindes) - , Erwin Waterlander - (beheerder)" #. type: textblock -#: dos2unix.pod:896 -msgid "Project page: L" +#: dos2unix.pod:920 +#, fuzzy +#| msgid "Project page: L" +msgid "Project page: L" msgstr "Projectpagina: L" #. type: textblock -#: dos2unix.pod:898 -msgid "SourceForge page: L" +#: dos2unix.pod:922 +#, fuzzy +#| msgid "SourceForge page: L" +msgid "SourceForge page: L" msgstr "SourceForge-pagina: L" #. type: =head1 -#: dos2unix.pod:900 +#: dos2unix.pod:924 msgid "SEE ALSO" msgstr "ZIE OOK" #. type: textblock -#: dos2unix.pod:902 +#: dos2unix.pod:926 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" +#, fuzzy +#~| msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." +#~ msgid "Although the name of this mode is B, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." +#~ msgstr "Hoewel de naam van deze modus ASCII is, wat een 7-bits standaard is, is de werkelijke modus 8-bits. Gebruik altijd deze modus wanneer u Unicode UTF-8-bestanden omzet." + +#~ msgid "Convert only line breaks. This is the default conversion mode." +#~ msgstr "Alleen regeleindes converteren. Dit is de standaardconversiemodus." + +#~ msgid "In mode C only line breaks are converted. This is the default conversion mode." +#~ msgstr "In modus C worden alleen regeleindes omgezet. Dit is de standaardmodus." + #~ msgid "The Windows versions of dos2unix and unix2dos convert UTF-16 encoded files always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos convert UTF-16 encoded files to the locale character encoding when it is set to UTF-8. Use the locale(1) command to find out what the locale character encoding is." #~ msgstr "De Windows-versies van dos2unix en unix2dos converteren UTF-16-gecodeerde bestanden altijd naar UTF-8-gecodeerde bestanden. Unix-versies van dos2unix/unix2dos zetten UTF-16-gecodeerde bestanden om naar de lokale tekencodering als die gelijk is aan UTF-8. Gebruik de opdracht locale(1) om uit te vinden wat de lokale tekencodering is." diff --git a/dos2unix/po-man/pl.po b/dos2unix/po-man/pl.po index 6d7b8a1..ace8c50 100644 --- a/dos2unix/po-man/pl.po +++ b/dos2unix/po-man/pl.po @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix-man 7.5.0-beta5\n" -"POT-Creation-Date: 2023-04-23 10:34+0200\n" -"PO-Revision-Date: 2023-04-26 18:15+0200\n" +"Project-Id-Version: dos2unix-man 7.5.2-beta3\n" +"POT-Creation-Date: 2023-11-27 22:01+0100\n" +"PO-Revision-Date: 2023-11-29 21:05+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "Language: pl\n" @@ -144,8 +144,8 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:121 -msgid "Convert only line breaks. This is the default conversion mode." -msgstr "Konwersja tylko znaków końca linii. Jest to domyślny tryb konwersji." +msgid "Default conversion mode. See also section CONVERSION MODES." +msgstr "Domyślny tryb konwersji. Więcej w sekcji TRYBY KONWERSJI." #. type: =item #: dos2unix.pod:123 @@ -398,7 +398,7 @@ msgid "The following information is printed, in this order: number of DOS line b msgstr "Wypisywane są następujące informacje, w tej kolejności: liczba DOS-owych końców linii, liczba uniksowych końców linii, liczba macowych końców linii, znacznik BOM, tekstowy lub binarny, nazwa pliku." #. type: textblock -#: dos2unix.pod:274 +#: dos2unix.pod:274 dos2unix.pod:290 msgid "Example output:" msgstr "Przykładowe wyjście:" @@ -433,116 +433,151 @@ msgstr "Uwaga: czasami plik binarny może być błędnie rozpoznany jako tekstow #. type: textblock #: dos2unix.pod:287 +msgid "If in addition option C<-e> or C<--add-eol> is used also the type of the line break of the last line is printed, or C if there is none." +msgstr "Jeśli dodatkowo użyta jest opcja C<-e> lub C<--add-eol>, wypisywany jest także rodzaj końca linii z ostatniej linii, lub C, jeśli nie ma żadnego." + +#. type: verbatim +#: dos2unix.pod:292 +#, no-wrap +msgid "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" +msgstr "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" + +#. type: textblock +#: dos2unix.pod:297 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Opcjonalnie można ustawić dodatkowe flagi, aby zmienić wyjście. Można dodać jedną lub więcej flag." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:302 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:304 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "Wypisanie wierszy informacji o pliku zakończonych znakiem NUL zamiast znaku nowej linii. Pozwala to na poprawną interpretację nazw plików zawierających spacje lub cudzysłowy w przypadku użycia flagi c. Flagi należy używać w połączeniu z opcją C<-0> lub C<--null> programu xargs(1)." #. type: =item -#: dos2unix.pod:299 +#: dos2unix.pod:309 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:301 +#: dos2unix.pod:311 msgid "Print number of DOS line breaks." msgstr "Wypisanie liczby DOS-owych końców linii." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:313 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:315 msgid "Print number of Unix line breaks." msgstr "Wypisanie liczby uniksowych końców linii." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:317 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:319 msgid "Print number of Mac line breaks." msgstr "Wypisanie liczby macowych końców linii." #. type: =item -#: dos2unix.pod:311 +#: dos2unix.pod:321 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:323 msgid "Print the byte order mark." msgstr "Wypisanie znacznika BOM." #. type: =item -#: dos2unix.pod:315 +#: dos2unix.pod:325 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:317 +#: dos2unix.pod:327 msgid "Print if file is text or binary." msgstr "Wypisanie, czy plik jest tekstowy, czy binarny." #. type: =item -#: dos2unix.pod:319 +#: dos2unix.pod:329 +msgid "B" +msgstr "B" + +#. type: textblock +#: dos2unix.pod:331 +msgid "Print the type of the line break of the last line, or C if there is none." +msgstr "Wypisanie rodzaju końca wiersza w ostatnim wierszu, lub C, jeśli nie ma żadnego." + +#. type: =item +#: dos2unix.pod:333 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:321 +#: dos2unix.pod:335 msgid "Print only the files that would be converted." msgstr "Wypisanie tylko plików, które zostałyby przekonwertowane." #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:337 msgid "With the C flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Z flagą C dos2unix wypisze tylko pliki zawierające DOS-owe końce linii, a unix2dos wypisze tylko nazwy plików zawierających uniksowe końce linii." +#. type: textblock +#: dos2unix.pod:340 +msgid "If in addition option C<-e> or C<--add-eol> is used also the files that lack a line break on the last line will be printed." +msgstr "Jeśli dodatkowo użyta jest opcja C<-e> lub C<--add-eol>, wypisywane są także pliki bez zakończenia ostatniej linii." + #. type: =item -#: dos2unix.pod:326 +#: dos2unix.pod:343 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:345 msgid "Print a header." msgstr "Wypisanie nagłówka." #. type: =item -#: dos2unix.pod:330 +#: dos2unix.pod:347 msgid "B

" msgstr "B

" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:349 msgid "Show file names without path." msgstr "Wyświetlanie nazw plików bez ścieżki." #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:353 msgid "Examples:" msgstr "Przykłady:" #. type: textblock -#: dos2unix.pod:338 +#: dos2unix.pod:355 msgid "Show information for all *.txt files:" msgstr "Pokazanie informacji o wszystkich plikach *.txt:" #. type: verbatim -#: dos2unix.pod:340 +#: dos2unix.pod:357 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -552,12 +587,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:342 +#: dos2unix.pod:359 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Pokazanie tylko liczby DOS-owych i uniksowych końców linii:" #. type: verbatim -#: dos2unix.pod:344 +#: dos2unix.pod:361 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -567,12 +602,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:346 +#: dos2unix.pod:363 msgid "Show only the byte order mark:" msgstr "Pokazanie tylko znacznika BOM:" #. type: verbatim -#: dos2unix.pod:348 +#: dos2unix.pod:365 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -582,12 +617,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:350 +#: dos2unix.pod:367 msgid "List the files that have DOS line breaks:" msgstr "Wypisanie listy plików zawierających DOS-owe końce linii:" #. type: verbatim -#: dos2unix.pod:352 +#: dos2unix.pod:369 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -597,12 +632,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:354 +#: dos2unix.pod:371 msgid "List the files that have Unix line breaks:" msgstr "Wypisanie listy plików zawierających uniksowe końce linii:" #. type: verbatim -#: dos2unix.pod:356 +#: dos2unix.pod:373 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -612,12 +647,27 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:358 +#: dos2unix.pod:375 +msgid "List the files that have DOS line breaks or lack a line break on the last line:" +msgstr "Wypisanie listy plików zawierających DOS-owe końce linii lub bez znaku końca w ostatniej linii:" + +#. type: verbatim +#: dos2unix.pod:377 +#, no-wrap +msgid "" +" dos2unix -e -ic *.txt\n" +"\n" +msgstr "" +" dos2unix -e -ic *.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:379 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "Konwersja tylko plików mających DOS-owe końce linii, pozostawienie pozostałych bez zmian:" #. type: verbatim -#: dos2unix.pod:360 +#: dos2unix.pod:381 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -627,12 +677,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:362 +#: dos2unix.pod:383 msgid "Find text files that have DOS line breaks:" msgstr "Wyszukanie plików tekstowych zawierających DOS-owe końce linii:" #. type: verbatim -#: dos2unix.pod:364 +#: dos2unix.pod:385 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -642,122 +692,122 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:366 +#: dos2unix.pod:387 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:368 +#: dos2unix.pod:389 msgid "Keep the date stamp of output file same as input file." msgstr "Zachowanie znacznika czasu pliku wyjściowego takiego samego, jak pliku wejściowego." #. type: =item -#: dos2unix.pod:370 +#: dos2unix.pod:391 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:372 +#: dos2unix.pod:393 msgid "Display program's license." msgstr "Wyświetlenie licencji programu." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:395 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:397 msgid "Add additional newline." msgstr "Dodanie dodatkowego znaku końca linii." #. type: textblock -#: dos2unix.pod:378 +#: dos2unix.pod:399 msgid "B: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B: tylko DOS-owe znaki końca linii są zamieniane na dwa uniksowe. W trybie Mac tylko macowe znaki końca linii są zamieniane na dwa uniksowe." #. type: textblock -#: dos2unix.pod:382 +#: dos2unix.pod:403 msgid "B: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B: tylko uniksowe znaki końca linii są zamieniane na dwa DOS-owe. W trybie Mac uniksowe znaki końca linii są zamieniane na dwa macowe." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:406 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:408 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "Zapisanie znacznika BOM (Byte Order Mark) w pliku wyjściowym. Domyślnie zapisywany jest BOM UTF-8." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:411 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "Jeśli plik wejściowy jest w kodowaniu UTF-16 i użyto opcji C<-u>, zostanie zapisany BOM UTF-16." #. type: textblock -#: dos2unix.pod:393 +#: dos2unix.pod:414 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "Nigdy nie należy używać tej opcji, jeśli kodowanie wyjściowe jest inne niż UTF-8, UTF-16 lub GB18030. Więcej w sekcji UNICODE." #. type: =item -#: dos2unix.pod:397 +#: dos2unix.pod:418 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile PLIK_WEJ PLIK_WYJ ...>" #. type: textblock -#: dos2unix.pod:399 +#: dos2unix.pod:420 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I be used or you I lose your files." msgstr "Tryb nowego pliku. Konwersja PLIKU_WEJ z zapisem wyjścia do PLIKU_WYJ. Nazwy plików muszą być podane parami, a masek I należy używać, gdyż I to utratę plików." #. type: textblock -#: dos2unix.pod:403 +#: dos2unix.pod:424 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "Osoba uruchamiająca konwersję w trybie nowego pliku (par) będzie właścicielem przekonwertowanego pliku. Prawa odczytu/zapisu nowego pliku będą pochodziły z praw pliku oryginalnego po odjęciu umask(1) osoby uruchamiającej konwersję." #. type: =item -#: dos2unix.pod:408 +#: dos2unix.pod:429 msgid "B<--no-allow-chown>" msgstr "B<--no-allow-chown>" #. type: textblock -#: dos2unix.pod:410 +#: dos2unix.pod:431 msgid "Don't allow file ownership change in old file mode (default)." msgstr "Bez zezwolenia na zmianę właściciela pliku w trybie starego pliku (domyślne)." #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:433 msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." msgstr "Przerwanie konwersji, jeżeli użytkownik lub grupa oryginalnego pliku nie może być zachowana w trybie starego pliku. P. także opcje C<-o> oraz C<-n>. Ta opcja jest dostępna tylko jeśli dos2unix ma obsługę zachowywania użytkownika i grupy plików." #. type: =item -#: dos2unix.pod:417 +#: dos2unix.pod:438 msgid "B<--no-add-eol>" msgstr "B<--no-add-eol>" #. type: textblock -#: dos2unix.pod:419 +#: dos2unix.pod:440 msgid "Do not add a line break to the last line if there isn't one." msgstr "Bez dodawania znaku końca linii do ostatniego wiersza, jeśli ten go nie zawiera." #. type: =item -#: dos2unix.pod:421 +#: dos2unix.pod:442 msgid "B<-O, --to-stdout>" msgstr "B<-O, --to-stdout>" #. type: textblock -#: dos2unix.pod:423 +#: dos2unix.pod:444 msgid "Write to standard output, like a Unix filter. Use option C<-o> to go back to old file (in-place) mode." msgstr "Zapis na standardowe wyjście, jak filtr uniksowy. Opcja C<-o> przywróci tryb starego pliku (zamianę z miejscu)." #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:447 msgid "Combined with option C<-e> files can be properly concatenated. No merged last and first lines, and no Unicode byte order marks in the middle of the concatenated file. Example:" msgstr "W połączeniu z opcją C<-e> pliki mogą być właściwie łączone - bez połączonych ostatnich i pierwszych linii oraz znaków unikodowych BOM w środku połączonego pliku. Przykład:" #. type: verbatim -#: dos2unix.pod:430 +#: dos2unix.pod:451 #, no-wrap msgid "" " dos2unix -e -O file1.txt file2.txt > output.txt\n" @@ -767,32 +817,32 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:432 +#: dos2unix.pod:453 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile PLIK ...>" #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:455 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "Tryb starego pliku. Konwersja PLIKU i nadpisanie go wyjściem. Program działa domyślnie w tym trybie. Można używać masek." #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:458 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "W trybie starego pliku (w miejscu) przekonwertowany plik otrzymuje tego samego właściciela, grupę oraz prawa odczytu/zapisu, jak plik oryginalny - także wtedy, gdy plik jest konwertowany przez innego użytkownika, mającego prawo zapisu do pliku (np. przez użytkownika root). Konwersja zostanie przerwana, jeśli nie będzie możliwe zachowanie oryginalnych wartości. Zmiana właściciela mogłaby oznaczać, że pierwotny właściciel nie może już odczytać pliku. Zmiana grupy mogłaby być zagrożeniem bezpieczeństwa, plik mógłby być czytelny dla nie zamierzonych osób. Zachowanie właściciela, grupy i praw odczytu/zapisu jest obsługiwane tylko na Uniksie." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:467 msgid "To check if dos2unix has support for preserving the user and group ownership of files type C." msgstr "Aby sprawdzić, czy doswunix ma obsługę zachowywania użytkownika i grupy plików, można napisać C." #. type: textblock -#: dos2unix.pod:449 +#: dos2unix.pod:470 msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" msgstr "Konwersja jest wykonywana zawsze przy użyciu pliku tymczasowego. Jeśli w trakcie konwersji wystąpi błąd, plik tymczasowy jest usuwany, a plik oryginalny pozostaje nietknięty. Jeśli konwersja się powiedzie, plik oryginalny jest zastępowany plikiem tymczasowym. Można mieć prawa zapisu do pliku oryginalnego, ale brak uprawnień, aby nadać tego samego właściciela i/lub grupę, co plik oryginalny, plikowi tymczasowemu. Oznacza to, że nie można zachować użytkownika i/lub grupy oryginalnego pliku. W takim przypadku można użyć opcji C<--allow-chown>, aby kontynuować konwersję:" #. type: verbatim -#: dos2unix.pod:458 +#: dos2unix.pod:479 #, no-wrap msgid "" " dos2unix --allow-chown foo.txt\n" @@ -802,12 +852,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:460 +#: dos2unix.pod:481 msgid "Another option is to use new file mode:" msgstr "Inny sposób to użycie trybu nowego pliku:" #. type: verbatim -#: dos2unix.pod:462 +#: dos2unix.pod:483 #, no-wrap msgid "" " dos2unix -n foo.txt foo.txt\n" @@ -817,227 +867,227 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:485 msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." msgstr "Zaletą opcji C<--allow-chown> jest możliwość użycia masek oraz zachowanie właściciela w miarę możliwości." #. type: =item -#: dos2unix.pod:467 +#: dos2unix.pod:488 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:469 +#: dos2unix.pod:490 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Tryb cichy. Pominięcie wszystkich ostrzeżeń i komunikatów. Zwracanym kodem jest zero, chyba że podano błędne opcje linii poleceń." #. type: =item -#: dos2unix.pod:472 +#: dos2unix.pod:493 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:495 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "Usunięcie znaków BOM (Byte Order Mark). Bez zapisywania BOM do pliku wyjściowego. Jest to domyślne zachowanie przy konwersji na uniksowe końce linii. P. także opcja C<-b>." #. type: =item -#: dos2unix.pod:478 +#: dos2unix.pod:499 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:501 msgid "Skip binary files (default)." msgstr "Pominięcie plików binarnych (domyślne)." #. type: textblock -#: dos2unix.pod:482 +#: dos2unix.pod:503 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "Pomijanie plików binarnych ma na celu zapobieżenie przypadkowym błędom. Uwaga: wykrywanie plików binarnych nie jest w 100% odporne na błędy. Pliki wejściowe są przeszukiwane pod kątem symboli binarnych, które zwykle nie występują w plikach tekstowych. Może się zdarzyć, że plik binarny zawiera tylko zwykłe znaki tekstowe. Taki plik binarny będzie błędnie widziany jako plik tekstowy." #. type: =item -#: dos2unix.pod:488 +#: dos2unix.pod:509 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:490 +#: dos2unix.pod:511 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "Zachowanie oryginalnego kodowania pliku wejściowego UTF-16. Plik wyjściowy zostanie zapisany w tym samym kodowaniu UTF-16 (little lub big endian), co plik wejściowy. Zapobiega to przekształceniu do UTF-8. Do pliku zostanie zapisany odpowiedni znacznik BOM UTF-16. Tę opcję można wyłączyć opcją C<-ascii>." #. type: =item -#: dos2unix.pod:495 +#: dos2unix.pod:516 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:497 +#: dos2unix.pod:518 msgid "Assume that the input file format is UTF-16LE." msgstr "Przyjęcie, że format pliku wejściowego to UTF-16LE." #. type: textblock -#: dos2unix.pod:499 +#: dos2unix.pod:520 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "Jeśli w pliku wejściowym jest znacznik BOM (Byte Order Mark), ma on priorytet nad tą opcją." #. type: textblock -#: dos2unix.pod:502 +#: dos2unix.pod:523 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "Jeśli przyjęto błędne założenie (plik wejściowy nie jest w formacie UTF-16LE), a konwersja się uda, wynikiem będzie plik wyjściowy UTF-8 ze złym tekstem. Konwersję tę można odwrócić przy użyciu polecenia iconv(1) do konwersji wyjścia UTF-8 z powrotem do UTF-16LE. Przywróci to plik oryginalny." #. type: textblock -#: dos2unix.pod:507 +#: dos2unix.pod:528 msgid "The assumption of UTF-16LE works as a I. By switching to the default I mode the UTF-16LE assumption is turned off." msgstr "Przyjęcie UTF-16LE działa jako I. Przy przełączeniu na domyślny tryb I przyjęcie UTF-16LE jest wyłączane." #. type: =item -#: dos2unix.pod:510 +#: dos2unix.pod:531 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:512 +#: dos2unix.pod:533 msgid "Assume that the input file format is UTF-16BE." msgstr "Przyjęcie, że format pliku wejściowego to UTF-16BE." #. type: textblock -#: dos2unix.pod:514 +#: dos2unix.pod:535 msgid "This option works the same as option C<-ul>." msgstr "Ta opcja działa analogicznie do C<-ul>." #. type: =item -#: dos2unix.pod:516 +#: dos2unix.pod:537 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:518 +#: dos2unix.pod:539 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "Wyświetlanie szczegółowych komunikatów. Wyświetlane śa dodatkowe informacje o znacznikach BOM (Byte Order Mark) oraz liczbie przekonwertowanych końców linii." #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:542 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:523 +#: dos2unix.pod:544 msgid "Follow symbolic links and convert the targets." msgstr "Podążanie za dowiązaniami symbolicznymi i konwertowanie ich celów" #. type: =item -#: dos2unix.pod:525 +#: dos2unix.pod:546 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:527 +#: dos2unix.pod:548 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "Zastępowanie dowiązań symbolicznych przekonwertowanymi plikami (oryginalne pliki docelowe pozostają bez zmian)." #. type: =item -#: dos2unix.pod:530 +#: dos2unix.pod:551 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:532 +#: dos2unix.pod:553 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Pozostawienie dowiązań symbolicznych i celów bez zmian (domyślne)." #. type: =item -#: dos2unix.pod:534 +#: dos2unix.pod:555 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:536 +#: dos2unix.pod:557 msgid "Display version information and exit." msgstr "Wyświetlenie informacji o wersji i zakończenie." #. type: =head1 -#: dos2unix.pod:540 +#: dos2unix.pod:561 msgid "MAC MODE" msgstr "TRYB MAC" #. type: textblock -#: dos2unix.pod:542 -msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." -msgstr "W zwykłym trybie znaki końca linii są konwertowane z DOS-a do Uniksa i odwrotnie. Znaki końca linii systemu Mac nie są konwertowane." +#: dos2unix.pod:563 +msgid "By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." +msgstr "Domyślnie znaki końca linii są konwertowane z DOS-a do Uniksa i odwrotnie. Znaki końca linii systemu Mac nie są konwertowane." #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:566 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "W trybie Mac znaki końca linii są konwertowane z formatu Maca do Uniksa i odwrotnie. Znaki końca linii systemu DOS nie są zmieniane." #. type: textblock -#: dos2unix.pod:548 +#: dos2unix.pod:569 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C or C." msgstr "Aby uruchomić program w trybie Mac, należy użyć opcji linii poleceń C<-c mac> albo użyć poleceń C lub C." #. type: =head1 -#: dos2unix.pod:551 +#: dos2unix.pod:572 msgid "CONVERSION MODES" msgstr "TRYBY KONWERSJI" #. type: =item -#: dos2unix.pod:555 +#: dos2unix.pod:576 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:557 -msgid "In mode C only line breaks are converted. This is the default conversion mode." -msgstr "W trybie C konwertowane są tylko końce linii. Jest to domyślny tryb konwersji." +#: dos2unix.pod:578 +msgid "This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling B mode disables B<7bit> and B mode." +msgstr "To jest domyślny tryb konwersji. Służy do konwersji plików kodowanych ASCII lub zgodnie z ASCII, np. UTF-8. Włączenie trybu B wyłącza tryby B<7bit> i B." #. type: textblock -#: dos2unix.pod:560 -msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." -msgstr "Mimo że nazwa tego trybu to ASCII, które jest standardem 7-bitowym, jest to tryb 8-bitowy. Należy zawsze używać tego trybu przy konwersji plików Unicode UTF-8." +#: dos2unix.pod:582 +msgid "If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has UTF-16 support type C. See also section UNICODE." +msgstr "Jeśli dos2unix ma obsługę UTF-16, pliki kodowane UTF-16 są konwertowane do bieżącego kodowania w systamach zgodnych z POSIX lub do UTF-8 na Windows. Włączenie trybu B wyłącza opcję zachowywania kodowania UTF-16 (C<-u>) oraz opcje zakładające wejście UTF-16 (C<-ul> oraz C<-ub>). Aby sprawdzić, czy dos2unix ma obsługę UTF-16, można wywołać C. Więcej w sekcji UNICODE." #. type: =item -#: dos2unix.pod:564 +#: dos2unix.pod:588 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:566 +#: dos2unix.pod:590 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "W tym trybie wszystkie znaki 8-bitowe spoza ASCII (o wartościach od 128 do 255) są konwertowane do przestrzeni 7-bitowej." #. type: =item -#: dos2unix.pod:569 +#: dos2unix.pod:593 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:571 +#: dos2unix.pod:595 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "W tym trybie znaki są konwertowane między zestawem znaków DOS (stroną kodową) a zestawem znaków ISO-8859-1 (Latin-1) używanym na Uniksie. Znaki DOS-owe nie mające odpowiednika w ISO-8859-1, których nie da się przekonwertować, są zamieniane na kropkę. To samo dotyczy znaków ISO-8859-1 bez odpowiednika w DOS-ie." #. type: textblock -#: dos2unix.pod:576 +#: dos2unix.pod:600 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "Jeśli używana jest tylko opcja C<-iso>, dos2unix próbuje wykryć aktywną stronę kodową. Jeśli nie jest to możliwe, dos2unix używa domyślnej strony kodowej CP437, stosowanej głównie w USA. Aby wymusić określoną stronę kodową, należy użyć opcji C<-437> (US), C<-850> (zachodnioeuropejska), C<-860> (portugalska), C<-863> (kanadyjska francuska) lub C<-865> (nordycka). Ponadto obsługiwana jest strona kodowa Windows CP1252 (zachodnioeuropejska) przy użyciu opcji C<-1252>. W przypadku innych stron kodowych można użyć narzędzia dos2unix wraz z iconv(1). Iconv potrafi konwertować między wieloma kodowaniami znaków." #. type: textblock -#: dos2unix.pod:585 +#: dos2unix.pod:609 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "Nigdy nie należy używać konwersji ISO na plikach tekstowych w Unicode. Uszkodziłaby pliki kodowane UTF-8." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:611 msgid "Some examples:" msgstr "Kilka przykładów:" #. type: textblock -#: dos2unix.pod:589 +#: dos2unix.pod:613 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Konwersja z domyślnej strony kodowej DOS do uniksowego Latin-1:" #. type: verbatim -#: dos2unix.pod:591 +#: dos2unix.pod:615 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -1047,12 +1097,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:593 +#: dos2unix.pod:617 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Konwersja ze strony kodowej DOS CP850 do uniksowego Latin-1:" #. type: verbatim -#: dos2unix.pod:595 +#: dos2unix.pod:619 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -1062,12 +1112,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:597 +#: dos2unix.pod:621 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Konwersja ze strony kodowej Windows CP1252 do uniksowego Latin-1:" #. type: verbatim -#: dos2unix.pod:599 +#: dos2unix.pod:623 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -1077,12 +1127,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:601 +#: dos2unix.pod:625 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Konwersja ze strony kodowej Windows CP1252 do uniksowego UTF-8 (Unicode):" #. type: verbatim -#: dos2unix.pod:603 +#: dos2unix.pod:627 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -1092,12 +1142,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:605 +#: dos2unix.pod:629 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Konwersa z uniksowego Latin-1 do domyślnej strony kodowej DOS:" #. type: verbatim -#: dos2unix.pod:607 +#: dos2unix.pod:631 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -1107,12 +1157,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:609 +#: dos2unix.pod:633 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Konwersja z uniksowego Latin-1 do strony kodowej DOS CP850:" #. type: verbatim -#: dos2unix.pod:611 +#: dos2unix.pod:635 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1122,12 +1172,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:637 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Konwersja z uniksowego Latin-1 do strony kodowej Windows CP1252:" #. type: verbatim -#: dos2unix.pod:615 +#: dos2unix.pod:639 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1137,12 +1187,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:617 +#: dos2unix.pod:641 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Konwersja z uniksowego UTF-8 (Unicode) do strony kodowej Windows CP1252:" #. type: verbatim -#: dos2unix.pod:619 +#: dos2unix.pod:643 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1152,142 +1202,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:621 +#: dos2unix.pod:645 msgid "See also L and L." msgstr "Więcej pod adresem L oraz L." #. type: =head1 -#: dos2unix.pod:626 +#: dos2unix.pod:650 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:628 +#: dos2unix.pod:652 msgid "Encodings" msgstr "Kodowania" #. type: textblock -#: dos2unix.pod:630 +#: dos2unix.pod:654 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Istnieją różne kodowania Unicode. Pod Uniksem i Linuksem pliki Unicode są zwykle kodowane z użyciem UTF-8. Pod Windows pliki tekstowe Unicode mogą być kodowane w UTF-8, UTF-16, UTF-16 big-endian, ale przeważnie są kodowane w UTF-16." #. type: =head2 -#: dos2unix.pod:635 +#: dos2unix.pod:659 msgid "Conversion" msgstr "Konwersje" #. type: textblock -#: dos2unix.pod:637 -msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." -msgstr "Pliki tekstowe Unicode mogą mieć znaki końca linii systemu DOS, Unix lub Mac, podobnie jak zwykłe pliki tekstowe." +#: dos2unix.pod:661 +msgid "Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files." +msgstr "Pliki tekstowe Unicode mogą mieć znaki końca linii systemu DOS, Unix lub Mac, podobnie jak pliki tekstowe ASCII." #. type: textblock -#: dos2unix.pod:640 +#: dos2unix.pod:664 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Wszystkie wersje dos2unix i unix2dos potrafią konwertować pliki kodowane UTF-8, ponieważ UTF-8 jest wstecznie zgodne z ASCII." #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:667 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C." msgstr "Dos2unix i unix2dos z obsługą Unicode UTF-16 potrafią odczytywać pliki tekstowe kodowane UTF-16 little- oraz big-endian. Aby sprawdzić, czy dos2unix został zbudowany z obsługą UTF-16, należy napisać C." #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:671 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "Pod Uniksem/Linuksem pliki w kodowaniu UTF-16 są konwertowane do kodowania znaków ustawionej lokalizacji. Kodowanie znaków dla lokalizacji można sprawdzić poleceniem locale(1). Jeśli konwersja nie jest możliwa, wystąpi błąd, a plik zostanie pominięty." #. type: textblock -#: dos2unix.pod:652 +#: dos2unix.pod:676 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "Pod Windows pliki UTF-16 są domyślnie konwertowane do UTF-8. Pliki tekstkowe w kodowaniu UTF-8 są dobrze obsługiwane zarówno pod Windows, jak i Uniksem/Linuksem." #. type: textblock -#: dos2unix.pod:655 +#: dos2unix.pod:679 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "Kodowania UTF-16 i UTF-8 są w pełni zgodne, konwersja nie spowoduje utraty żadnej części tekstu. W przypadku wystąpienia błędu konwersji, na przykład w przypadku błędu w pliku wejściowym UTF-16, plik zostanie pominięty." #. type: textblock -#: dos2unix.pod:659 +#: dos2unix.pod:683 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "W przypadku użycia opcji C<-u>, plik wejściowy zostanie zapisany w tym samym kodowaniu UTF-16, co plik wejściowy. Opcja C<-u> zapobiega konwersji do UTF-8." #. type: textblock -#: dos2unix.pod:662 +#: dos2unix.pod:686 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "Dos2unix oraz unix2dos nie mają opcji pozwalającej na konwersję plików UTF-8 do UTF-16." #. type: textblock -#: dos2unix.pod:664 +#: dos2unix.pod:688 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "Tryby konwersji ISO i 7-bit nie działają na plikach UTF-16." #. type: =head2 -#: dos2unix.pod:666 +#: dos2unix.pod:690 msgid "Byte Order Mark" msgstr "Znacznik BOM" #. type: textblock -#: dos2unix.pod:668 -msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." -msgstr "W systemie Windows pliki tekstowe zwykle zawierają znacznik BOM (Byte Order Mark), ponieważ wiele programów dla Windows (w tym Notepad) dodaje domyślnie znaczniki BOM. Więcej informacji można znaleźć pod adresem L." +#: dos2unix.pod:692 +msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." +msgstr "W systemie Windows pliki tekstowe zwykle zawierają znacznik BOM (Byte Order Mark), ponieważ wiele programów dla Windows (w tym Notepad) dodaje domyślnie znaczniki BOM. Więcej informacji można znaleźć pod adresem L." #. type: textblock -#: dos2unix.pod:672 +#: dos2unix.pod:696 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "Pod Uniksem pliki Unicode zwykle nie mają znacznika BOM. Pliki tekstowe są traktowane jako kodowane zgodnie z kodowaniem znaków ustawionej lokalizacji." #. type: textblock -#: dos2unix.pod:675 +#: dos2unix.pod:699 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "Dos2unix potrafi wykryć tylko, czy plik jest w formacie UTF-16, jeśli zawiera znacznik BOM. Jeśli plik UTF-16 nie ma tego znacznika, dos2unix potraktuje plik jako binarny." #. type: textblock -#: dos2unix.pod:679 +#: dos2unix.pod:703 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Do konwersji pliku UTF-16 bez znacznika BOM można użyć opcji C<-ul> lub C<-ub>." #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:705 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "Dos2unix nie zapisuje domyślnie znaku BOM w pliku wyjściowym. Z opcją C<-b> Dos2unix zapisuje BOM, jeśli plik wejściowy zawiera BOM." #. type: textblock -#: dos2unix.pod:684 +#: dos2unix.pod:708 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "Unix2dos domyślnie zapisuje znaczniki BOM w pliku wyjściowym, jeśli plik wejściowy ma BOM. Aby usunąć BOM, można użyć opcji C<-r>." #. type: textblock -#: dos2unix.pod:687 +#: dos2unix.pod:711 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "Dos2unix oraz unix2dos zawsze zapisują znaczniki BOM, jeśli użyta zostanie opcja C<-m>." #. type: =head2 -#: dos2unix.pod:689 +#: dos2unix.pod:713 msgid "Unicode file names on Windows" msgstr "Unikodowe nazwy plików w Windows" #. type: textblock -#: dos2unix.pod:691 +#: dos2unix.pod:715 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C." msgstr "Dos2unix ma opcjonalną obsługę odczytu i zapisu nazw plików Unicode w linii poleceń Windows. Oznacza to, że dos2unix potrafi otwierać pliki zawierające w nazwie znaki spoza domyślnej systemowej strony kodowej ANSI. Aby sprawdzić, czy dos2unix dla Windows został zbudowany z obsługą nazw plików Unicode, można wpisać C." #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:721 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "Przy wyświetlaniu nazw plików Unicode w konsoli Windows występuje kilka problemów. Więcej informacji w opisie opcji C<-D>, C<--display-enc>. Nazwy plików mogą być wyświetlane błędnie na konsoli, ale pliki będą zapisywane z poprawną nazwą." #. type: =head2 -#: dos2unix.pod:701 +#: dos2unix.pod:725 msgid "Unicode examples" msgstr "Przykłady Unicode" #. type: textblock -#: dos2unix.pod:703 +#: dos2unix.pod:727 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Konwersja pliku UTF-16 (z BOM) z formatu Windows do uniksowego UTF-8:" #. type: verbatim -#: dos2unix.pod:705 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1297,12 +1347,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:731 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Konwersja pliku UTF-16LE (bez BOM) z formatu Windows do uniksowego UTF-8:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:733 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1312,12 +1362,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:735 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Konwersja z uniksowego UTF-8 do UTF-8 z BOM dla Windows:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:737 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1327,12 +1377,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:739 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Konwersja z uniksowego UTF-8 do UTF-16 dla Windows:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:741 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1342,47 +1392,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:719 +#: dos2unix.pod:743 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:721 -msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." -msgstr "GB18030 to standard urzędowy w Chinach. Obowiązkowy podzbiór standardu GB18030 jest oficjalnym wymaganiem każdego oprogramowania sprzedawanego w Chinach. Więcej pod adresem L." +#: dos2unix.pod:745 +msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." +msgstr "GB18030 to standard urzędowy w Chinach. Obowiązkowy podzbiór standardu GB18030 jest oficjalnym wymaganiem każdego oprogramowania sprzedawanego w Chinach. Więcej pod adresem L." #. type: textblock -#: dos2unix.pod:725 +#: dos2unix.pod:749 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "GB18030 jest w pełni zgodny z Unicode i może być uważany za format transformacji unikodu. Podobnie jak UTF-8, GB18030 jest zgodny z ASCII. Jest także zgodny ze stroną kodową Windows 936, znaną też jako GBK." #. type: textblock -#: dos2unix.pod:729 +#: dos2unix.pod:753 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C to get the list of supported locales." msgstr "Pod Uniksem/Linuksem pliki UTF-16 są konwertowane do GB18030, jeśli kodowanie dla lokalizacji jest ustawione na GB18030. Uwaga: będzie to działać tylko, jeśli lokalizacja jest obsługiwana przez system. Listę obsługiwanych lokalizacji można sprawdzić poleceniem C." #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:757 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "Pod Windows w celu konwersji plików UTF-16 do GB18030 należy użyć opcji C<-gb>." #. type: textblock -#: dos2unix.pod:735 +#: dos2unix.pod:759 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "Pliki w kodowaniu GB18030 mogą mieć znacznik BOM, podobnie jak pliki w Unicode." #. type: =head1 -#: dos2unix.pod:737 +#: dos2unix.pod:761 msgid "EXAMPLES" msgstr "PRZYKŁADY" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:763 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Odczyt ze standardowego wejścia i zapis na standardowe wyjście:" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:765 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1394,12 +1444,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:744 +#: dos2unix.pod:768 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "Konwersja i zastąpienie a.txt; konwersja i zastąpienie b.txt:" #. type: verbatim -#: dos2unix.pod:746 +#: dos2unix.pod:770 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1411,12 +1461,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:749 +#: dos2unix.pod:773 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "Konwersja i zastąpienie a.txt w trybie ascii:" #. type: verbatim -#: dos2unix.pod:751 +#: dos2unix.pod:775 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1426,12 +1476,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:753 +#: dos2unix.pod:777 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "Konwersja i zastąpienie a.txt w trybie ascii; konwersja i zastąpienie b.txt w trybie 7-bitowym:" #. type: verbatim -#: dos2unix.pod:756 +#: dos2unix.pod:780 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1445,12 +1495,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:760 +#: dos2unix.pod:784 msgid "Convert a.txt from Mac to Unix format:" msgstr "Konwersja a.txt z formatu Mac do formatu uniksowego:" #. type: verbatim -#: dos2unix.pod:762 +#: dos2unix.pod:786 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1462,12 +1512,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:765 +#: dos2unix.pod:789 msgid "Convert a.txt from Unix to Mac format:" msgstr "Konwersja a.txt z formatu uniksowego do formatu Mac:" #. type: verbatim -#: dos2unix.pod:767 +#: dos2unix.pod:791 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1479,12 +1529,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:770 +#: dos2unix.pod:794 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "Konwersja i zastąpienie a.txt z zachowaniem oryginalnego znacznika czasu:" #. type: verbatim -#: dos2unix.pod:772 +#: dos2unix.pod:796 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1496,12 +1546,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:775 +#: dos2unix.pod:799 msgid "Convert a.txt and write to e.txt:" msgstr "Konwersja a.txt i zapis do e.txt:" #. type: verbatim -#: dos2unix.pod:777 +#: dos2unix.pod:801 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1511,12 +1561,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:779 +#: dos2unix.pod:803 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "Konwersja a.txt i zapis do e.txt z zachowaniem znacznika czasu e.txt takiego, jak a.txt:" #. type: verbatim -#: dos2unix.pod:781 +#: dos2unix.pod:805 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1526,12 +1576,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:783 +#: dos2unix.pod:807 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "Konwersja i zastąpienie a.txt; konwersja b.txt i zapis do e.txt:" #. type: verbatim -#: dos2unix.pod:785 +#: dos2unix.pod:809 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1543,12 +1593,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:788 +#: dos2unix.pod:812 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "Konwersja c.txt i zapis do e.txt; konwersja i zastąpienie a.txt; konwersja i zastąpienie b.txt; konwersja d.txt i zapis do f.txt:" #. type: verbatim -#: dos2unix.pod:791 +#: dos2unix.pod:815 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1558,17 +1608,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:793 +#: dos2unix.pod:817 msgid "RECURSIVE CONVERSION" msgstr "KONWERSJA REKURENCYJNA" #. type: textblock -#: dos2unix.pod:795 +#: dos2unix.pod:819 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "W powłoce uniksowej można użyć poleceń find(1) i xargs(1) do rekurencyjnego uruchomienia dos2unix na wszystkich plikach tekstowych w strukturze drzewa katalogów. Na przykład, aby przekonwertować wszystkie pliki .txt w drzewie katalogów poniżej katalogu bieżącego, należy napisać:" #. type: verbatim -#: dos2unix.pod:799 +#: dos2unix.pod:823 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1578,12 +1628,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:801 +#: dos2unix.pod:825 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "Opcja C<-print0> polecenia find(1) i odpowiadająca jej opcja C<-0> polecenia xargs(1) są potrzebne, jeśli istnieją pliki ze spacjami lub cudzysłowami w nazwie. W przeciwnym wypadku opcje te można pominąć. Inny sposób to użycie find(1) z opcją C<-exec>:" #. type: verbatim -#: dos2unix.pod:805 +#: dos2unix.pod:829 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1593,12 +1643,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:807 +#: dos2unix.pod:831 msgid "In a Windows Command Prompt the following command can be used:" msgstr "Z poziomu linii poleceń Windows można użyć następującego polecenia:" #. type: verbatim -#: dos2unix.pod:809 +#: dos2unix.pod:833 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1608,12 +1658,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:811 +#: dos2unix.pod:835 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "Użytkownicy powłoki PowerShell mogą użyć następującego polecenia w Windows PowerShell:" #. type: verbatim -#: dos2unix.pod:813 +#: dos2unix.pod:837 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1623,22 +1673,22 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:816 +#: dos2unix.pod:840 msgid "LOCALIZATION" msgstr "LOKALIZACJA" #. type: =item -#: dos2unix.pod:820 +#: dos2unix.pod:844 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:822 +#: dos2unix.pod:846 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "Główny język wybiera się zmienną środowiskową LANG. Zmienna LANG składa się z kilku części. Pierwsza część to małe litery oznaczające kod języka. Druga część jest opcjonalna i zawiera kod kraju pisany wielkimi literami, poprzedzony podkreśleniem. Jest także opcjonalna trzecia część: kodowanie znaków, poprzedzone kropką. Kilka przykładów dla powłok zgodnych ze standardem POSIX:" #. type: verbatim -#: dos2unix.pod:829 +#: dos2unix.pod:853 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1660,47 +1710,47 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:837 -msgid "For a complete list of language and country codes see the gettext manual: L" -msgstr "Pełną listę kodów języków i krajów można znaleźć w podręczniku do gettexta: L" +#: dos2unix.pod:861 +msgid "For a complete list of language and country codes see the gettext manual: L" +msgstr "Pełną listę kodów języków i krajów można znaleźć w podręczniku do gettexta: L" #. type: textblock -#: dos2unix.pod:840 +#: dos2unix.pod:864 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "W systemach uniksowych do uzyskania informacji dotyczących lokalizacji można użyć polecenia locale(1)." #. type: =item -#: dos2unix.pod:843 +#: dos2unix.pod:867 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:845 -msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" -msgstr "Przy użyciu zmiennej środowiskowej LANGUAGE można określić listę języków wg priorytetu, oddzielonych dwukropkami. Dos2unix przyjmuje pierwszeństwo zmiennej LANGUAGE nad LANG. Na przykład, najpierw holenderski, następnie niemiecki: C. Aby skorzystać z listy wg priorytetów ze zmiennej LANGUAGE, trzeba najpierw włączyć lokalizację przez ustawienie zmiennej LANG (lub LC_ALL) na wartość inną niż \"C\". Więcej informacji znajduje się w podręczniku do gettexta: L" +#: dos2unix.pod:869 +msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" +msgstr "Przy użyciu zmiennej środowiskowej LANGUAGE można określić listę języków wg priorytetu, oddzielonych dwukropkami. Dos2unix przyjmuje pierwszeństwo zmiennej LANGUAGE nad LANG. Na przykład, najpierw holenderski, następnie niemiecki: C. Aby skorzystać z listy wg priorytetów ze zmiennej LANGUAGE, trzeba najpierw włączyć lokalizację przez ustawienie zmiennej LANG (lub LC_ALL) na wartość inną niż \"C\". Więcej informacji znajduje się w podręczniku do gettexta: L" #. type: textblock -#: dos2unix.pod:853 +#: dos2unix.pod:877 msgid "If you select a language which is not available you will get the standard English messages." msgstr "W przypadku wybrania niedostępnego języka, otrzymamy standardowe, angielskie komunikaty." #. type: =item -#: dos2unix.pod:857 +#: dos2unix.pod:881 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:859 +#: dos2unix.pod:883 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C. Option B<--version> will display the LOCALEDIR that is used." msgstr "Przy użyciu zmiennej środowiskowej DOS2UNIX_LOCALEDIR, można nadpisać ustawienie LOCALEDIR z czasu kompilacji. LOCALEDIR to katalog używany do znalezienia plików lokalizacji. Domyślną wartością dla GNU jest C. Opcja B<--version> wyświetla używaną wartość LOCALEDIR." #. type: textblock -#: dos2unix.pod:864 +#: dos2unix.pod:888 msgid "Example (POSIX shell):" msgstr "Przykład (dla powłoki POSIX):" #. type: verbatim -#: dos2unix.pod:866 +#: dos2unix.pod:890 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1710,71 +1760,71 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:871 +#: dos2unix.pod:895 msgid "RETURN VALUE" msgstr "WARTOŚĆ ZWRACANA" #. type: textblock -#: dos2unix.pod:873 +#: dos2unix.pod:897 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "W przypadku powodzenia zwracane jest zero. Jeśli wystąpi błąd systemowy, zwracany jest ostatni błąd systemowy. W przypadku innych błędów zwracane jest 1." #. type: textblock -#: dos2unix.pod:876 +#: dos2unix.pod:900 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "Wartość zwracana w trybie cichym to zawsze zero, z wyjątkiem sytuacji podania błędnych opcji linii poleceń." #. type: =head1 -#: dos2unix.pod:879 +#: dos2unix.pod:903 msgid "STANDARDS" msgstr "STANDARDY" #. type: textblock -#: dos2unix.pod:881 -msgid "L" -msgstr "L" +#: dos2unix.pod:905 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:883 -msgid "L" -msgstr "L" +#: dos2unix.pod:907 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:885 -msgid "L" -msgstr "L" +#: dos2unix.pod:909 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:887 -msgid "L" -msgstr "L" +#: dos2unix.pod:911 +msgid "L" +msgstr "L" #. type: =head1 -#: dos2unix.pod:889 +#: dos2unix.pod:913 msgid "AUTHORS" msgstr "AUTORZY" #. type: textblock -#: dos2unix.pod:891 +#: dos2unix.pod:915 msgid "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer)" msgstr "Benjamin Lin ; Bernd Johannes Wuebben (tryb mac2unix) ; Christian Wurll (dodawanie dodatkowej nowej linii) ; Erwin Waterlander (prowadzący)" #. type: textblock -#: dos2unix.pod:896 -msgid "Project page: L" -msgstr "Strona projektu: L" +#: dos2unix.pod:920 +msgid "Project page: L" +msgstr "Strona projektu: L" #. type: textblock -#: dos2unix.pod:898 -msgid "SourceForge page: L" -msgstr "Strona SourceForge: L" +#: dos2unix.pod:922 +msgid "SourceForge page: L" +msgstr "Strona SourceForge: L" #. type: =head1 -#: dos2unix.pod:900 +#: dos2unix.pod:924 msgid "SEE ALSO" msgstr "ZOBACZ TAKŻE" #. type: textblock -#: dos2unix.pod:902 +#: dos2unix.pod:926 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" diff --git a/dos2unix/po-man/pt_BR.po b/dos2unix/po-man/pt_BR.po index 7d50101..78d8824 100644 --- a/dos2unix/po-man/pt_BR.po +++ b/dos2unix/po-man/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix-man 7.4.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-20 22:32+0200\n" +"POT-Creation-Date: 2023-11-27 21:39+0100\n" "PO-Revision-Date: 2023-01-12 09:49-0300\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" @@ -149,8 +149,10 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:121 -msgid "Convert only line breaks. This is the default conversion mode." -msgstr "Converte apenas as quebras de linhas. Esse é o modo de conversão padrão." +#, fuzzy +#| msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES." +msgid "Default conversion mode. See also section CONVERSION MODES." +msgstr "Conversão entre conjunto de caractere do DOS e ISO-8859-1. Veja também a seção MODOS DE CONVERSÃO." #. type: =item #: dos2unix.pod:123 @@ -405,7 +407,7 @@ msgid "The following information is printed, in this order: number of DOS line b msgstr "A seguinte informação é exibida, nesta ordem: número de quebras de linha do DOS, número de quebras de linha do Unix, número de quebras de linha do Mac, marca de ordem de byte, \"text\" ou \"binary\", nome de arquivo." #. type: textblock -#: dos2unix.pod:274 +#: dos2unix.pod:274 dos2unix.pod:290 msgid "Example output:" msgstr "Exemplo de saída:" @@ -440,116 +442,166 @@ msgstr "Note que em algumas vezes um arquivo binário pode ser confundido com um #. type: textblock #: dos2unix.pod:287 +msgid "If in addition option C<-e> or C<--add-eol> is used also the type of the line break of the last line is printed, or C if there is none." +msgstr "" + +#. type: verbatim +#: dos2unix.pod:292 +#, fuzzy, no-wrap +#| msgid "" +#| " 6 0 0 no_bom text dos.txt\n" +#| " 0 6 0 no_bom text unix.txt\n" +#| " 0 0 6 no_bom text mac.txt\n" +#| " 6 6 6 no_bom text mixed.txt\n" +#| " 50 0 0 UTF-16LE text utf16le.txt\n" +#| " 0 50 0 no_bom text utf8unix.txt\n" +#| " 50 0 0 UTF-8 text utf8dos.txt\n" +#| " 2 418 219 no_bom binary dos2unix.exe\n" +#| "\n" +msgid "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" +msgstr "" +" 6 0 0 no_bom text dos.txt\n" +" 0 6 0 no_bom text unix.txt\n" +" 0 0 6 no_bom text mac.txt\n" +" 6 6 6 no_bom text mixed.txt\n" +" 50 0 0 UTF-16LE text utf16le.txt\n" +" 0 50 0 no_bom text utf8unix.txt\n" +" 50 0 0 UTF-8 text utf8dos.txt\n" +" 2 418 219 no_bom binary dos2unix.exe\n" +"\n" + +#. type: textblock +#: dos2unix.pod:297 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Opcionalmente, opções extra podem ser definidas para alterar a saída. Uma ou mais opções podem ser adicionadas." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:302 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:304 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "Exibe as linhas de informações de arquivo seguido por um caractere nulo em vez de um caractere de nova linha. Isso habilita interpretação correta de nomes de arquivo com espaços ou aspas quando a opção c é usada. Use essa opção na combinação com opções C<-0> ou C<--null> do xargs(1)." #. type: =item -#: dos2unix.pod:299 +#: dos2unix.pod:309 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:301 +#: dos2unix.pod:311 msgid "Print number of DOS line breaks." msgstr "Exibe o número de quebras de linhas do DOS." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:313 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:315 msgid "Print number of Unix line breaks." msgstr "Exibe o número de quebras de linhas do Unix." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:317 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:319 msgid "Print number of Mac line breaks." msgstr "Exibe o número de quebras de linhas do Mac." #. type: =item -#: dos2unix.pod:311 +#: dos2unix.pod:321 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:323 msgid "Print the byte order mark." msgstr "Exibe a marca de ordem de byte." #. type: =item -#: dos2unix.pod:315 +#: dos2unix.pod:325 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:317 +#: dos2unix.pod:327 msgid "Print if file is text or binary." msgstr "Exibe se arquivo é texto ou binário." #. type: =item -#: dos2unix.pod:319 +#: dos2unix.pod:329 +msgid "B" +msgstr "" + +#. type: textblock +#: dos2unix.pod:331 +msgid "Print the type of the line break of the last line, or C if there is none." +msgstr "" + +#. type: =item +#: dos2unix.pod:333 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:321 +#: dos2unix.pod:335 msgid "Print only the files that would be converted." msgstr "Exibe apenas os arquivos que seriam convertidos." #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:337 msgid "With the C flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Com a opção C, dos2unix vai exibir apenas os arquivos que contêm quebras de linha do DOS, unix2dos vai exibir apenas os nomes de arquivos que contêm quebras de linha do Unix." +#. type: textblock +#: dos2unix.pod:340 +msgid "If in addition option C<-e> or C<--add-eol> is used also the files that lack a line break on the last line will be printed." +msgstr "" + #. type: =item -#: dos2unix.pod:326 +#: dos2unix.pod:343 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:345 msgid "Print a header." msgstr "Exibe um cabeçalho." #. type: =item -#: dos2unix.pod:330 +#: dos2unix.pod:347 msgid "B

" msgstr "B

" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:349 msgid "Show file names without path." msgstr "Mostra nomes de arquivos sem caminho." #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:353 msgid "Examples:" msgstr "Exemplos:" #. type: textblock -#: dos2unix.pod:338 +#: dos2unix.pod:355 msgid "Show information for all *.txt files:" msgstr "Mostra informação sobre todos os arquivos *.txt:" #. type: verbatim -#: dos2unix.pod:340 +#: dos2unix.pod:357 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -559,12 +611,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:342 +#: dos2unix.pod:359 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Mostra apenas o número de quebras de linha DOS e Unix:" #. type: verbatim -#: dos2unix.pod:344 +#: dos2unix.pod:361 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -574,12 +626,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:346 +#: dos2unix.pod:363 msgid "Show only the byte order mark:" msgstr "Mostra apenas a marca de ordem de byte:" #. type: verbatim -#: dos2unix.pod:348 +#: dos2unix.pod:365 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -589,12 +641,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:350 +#: dos2unix.pod:367 msgid "List the files that have DOS line breaks:" msgstr "Lista os arquivos que possuem quebras de linha do DOS:" #. type: verbatim -#: dos2unix.pod:352 +#: dos2unix.pod:369 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -604,12 +656,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:354 +#: dos2unix.pod:371 msgid "List the files that have Unix line breaks:" msgstr "Lista os arquivos que possuem quebras de linha do Unix:" #. type: verbatim -#: dos2unix.pod:356 +#: dos2unix.pod:373 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -619,12 +671,32 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:358 +#: dos2unix.pod:375 +#, fuzzy +#| msgid "List the files that have DOS line breaks:" +msgid "List the files that have DOS line breaks or lack a line break on the last line:" +msgstr "Lista os arquivos que possuem quebras de linha do DOS:" + +#. type: verbatim +#: dos2unix.pod:377 +#, fuzzy, no-wrap +#| msgid "" +#| " dos2unix -ic *.txt\n" +#| "\n" +msgid "" +" dos2unix -e -ic *.txt\n" +"\n" +msgstr "" +" dos2unix -ic *.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:379 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "Converte apenas arquivos que possuem quebras de linha do DOS e não altera outros arquivos:" #. type: verbatim -#: dos2unix.pod:360 +#: dos2unix.pod:381 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -634,12 +706,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:362 +#: dos2unix.pod:383 msgid "Find text files that have DOS line breaks:" msgstr "Localiza arquivos de texto que possuam quebras de linha do DOS:" #. type: verbatim -#: dos2unix.pod:364 +#: dos2unix.pod:385 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -649,126 +721,126 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:366 +#: dos2unix.pod:387 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:368 +#: dos2unix.pod:389 msgid "Keep the date stamp of output file same as input file." msgstr "Mantém a marca da data do arquivo de saída igual ao do arquivo de entrada." #. type: =item -#: dos2unix.pod:370 +#: dos2unix.pod:391 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:372 +#: dos2unix.pod:393 msgid "Display program's license." msgstr "Exibe a licença do programa." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:395 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:397 msgid "Add additional newline." msgstr "Adiciona nova linha adicional." #. type: textblock -#: dos2unix.pod:378 +#: dos2unix.pod:399 msgid "B: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B: Apenas quebras de linha do DOS são alteradas para duas quebras de linha do Unix. No modo Mac, apenas quebras de linha do Mac são alterados para duas quebras de linha do Unix." #. type: textblock -#: dos2unix.pod:382 +#: dos2unix.pod:403 msgid "B: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B: Apenas quebras de linha do Unix são alteradas para duas quebras de linha do DOS. No modo Mac, quebras de linha do Unix são alteradas para duas quebras de linha do Mac." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:406 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:408 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "Escreve uma marca de ordem de byte (BOM) no arquivo de saída. Por padrão, um BOM UTF-8 é escrito." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:411 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "Quando o arquivo de entrada é UTF-16, e a opção C<-u> é usada, um BOM UTF-16 será escrito." #. type: textblock -#: dos2unix.pod:393 +#: dos2unix.pod:414 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "Nunca use essa opção quando a codificação de saída é outra além de UTF-8, UTF-16 ou GB18030. Veja também a seção UNICODE." #. type: =item -#: dos2unix.pod:397 +#: dos2unix.pod:418 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile ARQENT ARQSAÍDA ...>" #. type: textblock -#: dos2unix.pod:399 +#: dos2unix.pod:420 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I be used or you I lose your files." msgstr "Modo de novo arquivo. Converte o arquivo ARQENT e escreve a saída para o arquivo ARQSAÍDA. Os nomes de arquivos devem ser fornecidos em pares e nome coringa I deveriam ser usados ou você I perder seus arquivos." #. type: textblock -#: dos2unix.pod:403 +#: dos2unix.pod:424 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "A pessoa que começa a conversão em modo de novo arquivo (pareado) será o dono do arquivo convertido. As permissões de leitura/escrita do novo arquivo serão as permissões do arquivo original menos a umask(1) da pessoa que executa a conversão." #. type: =item -#: dos2unix.pod:408 +#: dos2unix.pod:429 msgid "B<--no-allow-chown>" msgstr "B<--no-allow-chown>" #. type: textblock -#: dos2unix.pod:410 +#: dos2unix.pod:431 msgid "Don't allow file ownership change in old file mode (default)." msgstr "Não permite alteração da propriedade do arquivo no modo de arquivo antigo (padrão)." #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:433 msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." msgstr "Aborta a conversão quando a propriedade do usuário e/ou do grupo do arquivo original não puder ser preservada no modo de arquivo antigo. Veja também as opções C<-o> e C<-n>. Esta opção só está disponível se o dos2unix oferecer suporte à preservação da propriedade do usuário e do grupo de arquivos." #. type: =item -#: dos2unix.pod:417 +#: dos2unix.pod:438 #, fuzzy #| msgid "B<-m, --add-bom>" msgid "B<--no-add-eol>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:419 +#: dos2unix.pod:440 msgid "Do not add a line break to the last line if there isn't one." msgstr "" #. type: =item -#: dos2unix.pod:421 +#: dos2unix.pod:442 #, fuzzy #| msgid "B<-q, --quiet>" msgid "B<-O, --to-stdout>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:423 +#: dos2unix.pod:444 msgid "Write to standard output, like a Unix filter. Use option C<-o> to go back to old file (in-place) mode." msgstr "" #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:447 msgid "Combined with option C<-e> files can be properly concatenated. No merged last and first lines, and no Unicode byte order marks in the middle of the concatenated file. Example:" msgstr "" #. type: verbatim -#: dos2unix.pod:430 +#: dos2unix.pod:451 #, fuzzy, no-wrap #| msgid "" #| " dos2unix -ul -n in.txt out.txt\n" @@ -781,34 +853,34 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:432 +#: dos2unix.pod:453 #, fuzzy #| msgid "B<-o, --oldfile FILE ...>" msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile ARQUIVO ...>" #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:455 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "Modo de arquivo antigo. Converte o arquivo ARQUIVO e o sobrescreve com a saída. O programa, por padrão, executa neste modo. Nomes coringas podem ser usados." #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:458 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "No modo de arquivo antigo (no-lugar) o arquivo convertido recebe no mesmo dono, grupo e permissões de leitura/escrita que o arquivo original. Também, quando o arquivo é convertido por outro usuário que tenha permissões de escrita no arquivo (ex.: usuário root). A conversão será abortada quando não for possível preservar os valores originais. Alteração do dono pode significar que o dono original não é mais capaz de ler o arquivo. Alteração do grupo pode ser um risco para a segurança, pois o arquivo pode ficar legível para pessoas cujo acesso não é desejado. Preservação do dono, grupo e permissões de leitura/escrita tem suporte apenas no Unix." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:467 msgid "To check if dos2unix has support for preserving the user and group ownership of files type C." msgstr "Para verificar se dos2unix oferece suporte à preservação da propriedade de usuário e de grupo de arquivos, digite C." #. type: textblock -#: dos2unix.pod:449 +#: dos2unix.pod:470 msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" msgstr "A conversão sempre é feita através de um arquivo temporário. Quando um erro ocorre no meio da conversão, o arquivo temporário é excluído e o arquivo original permanece intacto. Quando a conversão é bem sucedida, o arquivo original é substituído pelo arquivo temporário. Você pode ter permissão de gravação no arquivo original, mas nenhuma permissão para colocar a mesma propriedade de usuário e/ou de grupo no arquivo temporário como o arquivo original. Isso significa que você não consegue preservar a propriedade de usuário e/ou de grupo do arquivo original. Neste caso, você pode usar a opção C<-allow-chown> para continuar com a conversão:" #. type: verbatim -#: dos2unix.pod:458 +#: dos2unix.pod:479 #, no-wrap msgid "" " dos2unix --allow-chown foo.txt\n" @@ -818,12 +890,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:460 +#: dos2unix.pod:481 msgid "Another option is to use new file mode:" msgstr "Outra opção é usar o novo modo de arquivo:" #. type: verbatim -#: dos2unix.pod:462 +#: dos2unix.pod:483 #, no-wrap msgid "" " dos2unix -n foo.txt foo.txt\n" @@ -833,227 +905,229 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:485 msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." msgstr "A vantagem da opção C<--allow-chown> é que você pode usar coringas e as informações de propriedade serão preservadas quando possível." #. type: =item -#: dos2unix.pod:467 +#: dos2unix.pod:488 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:469 +#: dos2unix.pod:490 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Modo quieto. Suprime todos os avios e mensagens. O valor retornado é zero. Exceto quando opções de linha de comando erradas forem usadas." #. type: =item -#: dos2unix.pod:472 +#: dos2unix.pod:493 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:495 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "Remove marca de ordem de bytes (BOM). Não escreve um BOM no arquivo de saída. Esse é o comportamento padrão ao converter para quebras de linha Unix. Veja também a opção C<-b>." #. type: =item -#: dos2unix.pod:478 +#: dos2unix.pod:499 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:501 msgid "Skip binary files (default)." msgstr "Ignora arquivo binários (padrão)." #. type: textblock -#: dos2unix.pod:482 +#: dos2unix.pod:503 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "A ação de ignorar arquivos binários é feita para evitar equívocos acidentais. Fique ciente de que a detecção de arquivos binários não é 100% à prova de erros. Arquivos de entrada são analisados por símbolos binários que, geralmente, não são encontrados em arquivos textos. É possível que um arquivo binário contenha apenas caracteres de texto normais. tal arquivo binário pode ser acidentalmente visto como um arquivo de texto." #. type: =item -#: dos2unix.pod:488 +#: dos2unix.pod:509 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:490 +#: dos2unix.pod:511 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "Mantém a codificação UTF-16 original do arquivo de entrada. O arquivo de saída será escrito na mesma codificação UTF-16, em little ou big endian, como o arquivo de entrada. Isso evita transformação para UTF-8. Como consequência, um BOM UTF-16 será escrito. Essa opção pode ser desabilitada com a opção C<-ascii>." #. type: =item -#: dos2unix.pod:495 +#: dos2unix.pod:516 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:497 +#: dos2unix.pod:518 msgid "Assume that the input file format is UTF-16LE." msgstr "Presume que o formato de arquivo de entrada é UTF-16LE." #. type: textblock -#: dos2unix.pod:499 +#: dos2unix.pod:520 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "Quando há uma marca de ordem de byte no arquivo de entrada, esta tem prioridade sobre essa opção." #. type: textblock -#: dos2unix.pod:502 +#: dos2unix.pod:523 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "Quando você fizer uma presunção equivocada (o arquivo de entrada não estava no formato UTF-16LE) e a conversão funcionar, você terá um arquivo de saída UTF-8 com texto errado. Você pode desfazer a conversão errada com iconv(1) pela conversão do arquivo de saída UTF-8 de volta para UTF-16LE. Isso vai trazer de volta o arquivo para o original." #. type: textblock -#: dos2unix.pod:507 +#: dos2unix.pod:528 msgid "The assumption of UTF-16LE works as a I. By switching to the default I mode the UTF-16LE assumption is turned off." msgstr "A presunção de UTF-16LE funciona como um I. Ao alternara o modo I padrão, a presunção de UTF-16LE é desativada." #. type: =item -#: dos2unix.pod:510 +#: dos2unix.pod:531 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:512 +#: dos2unix.pod:533 msgid "Assume that the input file format is UTF-16BE." msgstr "Presume que o formato de arquivo de entrada é UTF-16BE." #. type: textblock -#: dos2unix.pod:514 +#: dos2unix.pod:535 msgid "This option works the same as option C<-ul>." msgstr "Essa opção funciona o mesmo que a opção C<-ul>." #. type: =item -#: dos2unix.pod:516 +#: dos2unix.pod:537 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:518 +#: dos2unix.pod:539 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "Exibe mensagens detalhadas. Informação extra é exibida sobre marcas de ordem de byte e a quantidade de quebras de linha convertidas." #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:542 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:523 +#: dos2unix.pod:544 msgid "Follow symbolic links and convert the targets." msgstr "Segue ligações simbólicas e converte os alvos." #. type: =item -#: dos2unix.pod:525 +#: dos2unix.pod:546 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:527 +#: dos2unix.pod:548 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "Substitui ligações simbólicas com arquivos convertidos (arquivos alvo originais permanecem inalterados)." #. type: =item -#: dos2unix.pod:530 +#: dos2unix.pod:551 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:532 +#: dos2unix.pod:553 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Mentém ligações simbólicas e alvos inalterados (padrão)." #. type: =item -#: dos2unix.pod:534 +#: dos2unix.pod:555 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:536 +#: dos2unix.pod:557 msgid "Display version information and exit." msgstr "Exibe informação da versão e sai." #. type: =head1 -#: dos2unix.pod:540 +#: dos2unix.pod:561 msgid "MAC MODE" msgstr "MODO MAC" #. type: textblock -#: dos2unix.pod:542 -msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." +#: dos2unix.pod:563 +#, fuzzy +#| msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." +msgid "By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." msgstr "No modo normal, as quebras de linhas são convertidas de DOS para Unix e vice-versa. Quebras de linha do Mac não são convertidas." #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:566 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "No modo Mac, quebras de linha são convertidas de Mac para Unix e vice-versa. Quebras de linha do DOS não são alteradas." #. type: textblock -#: dos2unix.pod:548 +#: dos2unix.pod:569 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C or C." msgstr "Para executar no modo Mac, use a opção de linha de comando C<-c mac> ou use os comandos C ou C." #. type: =head1 -#: dos2unix.pod:551 +#: dos2unix.pod:572 msgid "CONVERSION MODES" msgstr "MODOS DE CONVERSÃO" #. type: =item -#: dos2unix.pod:555 +#: dos2unix.pod:576 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:557 -msgid "In mode C only line breaks are converted. This is the default conversion mode." -msgstr "No modo C, apenas as quebras de linha são convertidas. Esse é o modo de conversão padrão." +#: dos2unix.pod:578 +msgid "This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling B mode disables B<7bit> and B mode." +msgstr "" #. type: textblock -#: dos2unix.pod:560 -msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." -msgstr "Apesar do nome deste modo ser ASCII, o qual é um padrão de 7 bits, o modo é em verdade 8 bits. Sempre use este modo quando quiser converter arquivos Unicode UTF-8." +#: dos2unix.pod:582 +msgid "If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has UTF-16 support type C. See also section UNICODE." +msgstr "" #. type: =item -#: dos2unix.pod:564 +#: dos2unix.pod:588 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:566 +#: dos2unix.pod:590 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "Neste modo todos os caracteres não-ASCII de 8 bits (com valores entre 128 e 255) são convertidos para um espaço de 7 bits." #. type: =item -#: dos2unix.pod:569 +#: dos2unix.pod:593 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:571 +#: dos2unix.pod:595 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Caracteres são convertidos entre um conjunto de caracteres do DOS (página de código) e conjunto de caracteres ISO-8859-1 (Latin-1) no Unix. Caracteres de DOS sem um equivalente ISO-8859-1, para os quais a conversão não é possível, são convertidos para um ponto. O mesmo vale para caracteres ISO-8859-1 sem a contraparte DOS." #. type: textblock -#: dos2unix.pod:576 +#: dos2unix.pod:600 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "Quando apenas a opção C<-iso> for usada, dos2unix vai tentar determinar a página de código ativa. Quando isso não for possível, dos2unix vai usar a página de código padrão CP437, a qual é usada principalmente nos EUA. Para forçar uma página de código específica, use as opções C<-437> (EUA), C<-850> (Europeu oriental), C<-860> (Português), C<-863> (Franco-canadense) ou C<-865> (Nórdico). Também há suporte à página de código do Windows CP1252 (Europeu ocidental) com a opção C<-1252>. Para outras páginas de código, use dos2unix em combinação cm iconv(1). Iconv pode converter entre uma lista grande de codificações de caracteres." #. type: textblock -#: dos2unix.pod:585 +#: dos2unix.pod:609 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "Nunca use conversão ISO em arquivos textos Unicode. Isso vai corromper os arquivos codificados em UTF-8." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:611 msgid "Some examples:" msgstr "Alguns exemplos:" #. type: textblock -#: dos2unix.pod:589 +#: dos2unix.pod:613 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Conversão da página de código padrão do DOS para Latin-1 do Unix:" #. type: verbatim -#: dos2unix.pod:591 +#: dos2unix.pod:615 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -1063,12 +1137,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:593 +#: dos2unix.pod:617 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Conversão da CP850 do DOS para Latin-1 do Unix:" #. type: verbatim -#: dos2unix.pod:595 +#: dos2unix.pod:619 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -1078,12 +1152,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:597 +#: dos2unix.pod:621 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Conversão da CP1252 do Windows para Latin-1 do Unix:" #. type: verbatim -#: dos2unix.pod:599 +#: dos2unix.pod:623 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -1093,12 +1167,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:601 +#: dos2unix.pod:625 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Conversão da CP1252 do Windows para UTF-8 (Unicode) do Unix:" #. type: verbatim -#: dos2unix.pod:603 +#: dos2unix.pod:627 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -1108,12 +1182,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:605 +#: dos2unix.pod:629 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Conversão de Latin-1 do Unix para página de código padrão do DOS:" #. type: verbatim -#: dos2unix.pod:607 +#: dos2unix.pod:631 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -1123,12 +1197,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:609 +#: dos2unix.pod:633 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Conversão do Latin-1 do Unix para CP850 do DOS:" #. type: verbatim -#: dos2unix.pod:611 +#: dos2unix.pod:635 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1138,12 +1212,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:637 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Conversão do Latin-1 do unix para CP1252 do Windows:" #. type: verbatim -#: dos2unix.pod:615 +#: dos2unix.pod:639 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1153,12 +1227,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:617 +#: dos2unix.pod:641 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Conversão do UTF-8 (Unicode) do Unix para CP1252 do Windows:" #. type: verbatim -#: dos2unix.pod:619 +#: dos2unix.pod:643 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1168,142 +1242,146 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:621 +#: dos2unix.pod:645 msgid "See also L and L." msgstr "Veja também L e L." #. type: =head1 -#: dos2unix.pod:626 +#: dos2unix.pod:650 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:628 +#: dos2unix.pod:652 msgid "Encodings" msgstr "Codificações" #. type: textblock -#: dos2unix.pod:630 +#: dos2unix.pod:654 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Exitem codificações Unicode diferentes. No Unix e no Linux, arquivos Unicode são geralmente codificados em UTF-8. No Windows, arquivos texto Unicode podem ser codificados em UTF-8, UTF-16 ou UTF-16 big endian, mas na maioria das vezes são codificados no formato UTF-16." #. type: =head2 -#: dos2unix.pod:635 +#: dos2unix.pod:659 msgid "Conversion" msgstr "Conversão" #. type: textblock -#: dos2unix.pod:637 -msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." +#: dos2unix.pod:661 +#, fuzzy +#| msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." +msgid "Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files." msgstr "Arquivos texto em Unicode pode ter quebras de linha DOS, Unix ou Mac, como arquivos texto comuns." #. type: textblock -#: dos2unix.pod:640 +#: dos2unix.pod:664 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Todas as versões do dos2unix e unix2dos podem converter arquivos codificados em UTF-8 porque UTF-8 foi projetado para ter compatibilidade reversa com ASCII." #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:667 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C." msgstr "Dos2unix e unix2dos com suporte a Unicode UTF-16 podem ler arquivos texto codificados em little e big endian UTF-16. Para ver se dos2unix foi compilado com suporte a UTF-16, digite C." #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:671 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "No Unix/Linux, arquivos codificados em UTF-16 são convertidos para a codificação de caracteres do localização. Use o comando locale(1) para descobrir qual é a codificação de caracteres da localização. Quando a conversão não for possível, ocorrerá um erro e o arquivo será ignorado." #. type: textblock -#: dos2unix.pod:652 +#: dos2unix.pod:676 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "No Windows, arquivos UTF-16 são convertidos, por padrão, para UTF-8. Arquivos texto formatados em UTF-8 possuem ótimo suporte em ambos Windows e Unix/Linux." #. type: textblock -#: dos2unix.pod:655 +#: dos2unix.pod:679 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "Codificações UTF-16 e UTF-8 são completamente compatíveis, não havendo qualquer perda de texto na conversão. Quando um erro de conversão UTF-16 para UTF-8 ocorre, por exemplo quando o arquivo de entrada UTF-16 contém um erro, o arquivo será ignorado." #. type: textblock -#: dos2unix.pod:659 +#: dos2unix.pod:683 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "Quando a opção C<-u> é usada, o arquivo de saída será escrito na mesma codificação UTF-16 que o arquivo de saída. A opção C<-u> evita conversão para UTF-8." #. type: textblock -#: dos2unix.pod:662 +#: dos2unix.pod:686 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "Dos2unix e unix2dos não possuem opção para converter arquivos UTF-8 para UTF-16." #. type: textblock -#: dos2unix.pod:664 +#: dos2unix.pod:688 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "Modo de conversão ISO e 7 bits não funcionam em arquivos UTF-16." #. type: =head2 -#: dos2unix.pod:666 +#: dos2unix.pod:690 msgid "Byte Order Mark" msgstr "Marca de ordem de byte" #. type: textblock -#: dos2unix.pod:668 -msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." +#: dos2unix.pod:692 +#, fuzzy +#| msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." +msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." msgstr "No Windows, arquivos Unicode normalmente têm uma Marca de Ordem de Byte (BOM), porque muitos programas (incluindo o Bloco de Notas) adiciona BOMs por padrão. Veja também L." #. type: textblock -#: dos2unix.pod:672 +#: dos2unix.pod:696 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "No Unix, arquivos Unicode normalmente não têm BOM. Presume-se que arquivos texto são codificados na codificação de caracteres da localização." #. type: textblock -#: dos2unix.pod:675 +#: dos2unix.pod:699 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "Dos2unix pode detectar apenas se um arquivo está no formato UTF-16 se o arquivo tiver BOM. Quando um arquivo UTF-16 não tiver BOM, dos2unix vai ver se o arquivo é um arquivo binário." #. type: textblock -#: dos2unix.pod:679 +#: dos2unix.pod:703 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Use a opção C<-ul> ou C<-ub> para converter um arquivo UTF-16 sem BOM." #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:705 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "Dos2unix escreve por padrão nenhum BOM no arquivo de saída. Com a opção C<-b>, o Dos2unix escreve um BOM quando o arquivo de entrada possuir BOM." #. type: textblock -#: dos2unix.pod:684 +#: dos2unix.pod:708 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "Unix2dos escreve por padrão um BOM no arquivo de saída quando o arquivo de entrada tem BOM. Use a opção C<-m> para remover BOM." #. type: textblock -#: dos2unix.pod:687 +#: dos2unix.pod:711 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "Dos2unix e unix2dos sempre escrevem BOM quando a opção C<-m> é usada." #. type: =head2 -#: dos2unix.pod:689 +#: dos2unix.pod:713 msgid "Unicode file names on Windows" msgstr "Nomes de arquivos Unicode no Windows" #. type: textblock -#: dos2unix.pod:691 +#: dos2unix.pod:715 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C." msgstr "Dos2unix possui um suporte opcional para leitura e escrita de nomes de arquivos Unicode no Prompt de Comando Windows. Isso significa que dos2unix pode abrir arquivos que possuam caracteres no nome que não são parte da página de código ANSI padrão do sistema. Para ver se dos2unix para Windows foi compilado com suporte a nomes de arquivos em Unicode, digite C." #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:721 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "Há alguns problemas com a exibição de nomes de arquivos Unicode em um console Windows. Veja a opção C<-D>, C<--display-enc>. Para nomes de arquivos pode ser exibido incorretamente, mas os arquivos serão escritos com o nome correto." #. type: =head2 -#: dos2unix.pod:701 +#: dos2unix.pod:725 msgid "Unicode examples" msgstr "Exemplos de Unicode" #. type: textblock -#: dos2unix.pod:703 +#: dos2unix.pod:727 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Conversão de UTF-16 do Windows (com BOM) para UTF-8 do Unix:" #. type: verbatim -#: dos2unix.pod:705 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1313,12 +1391,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:731 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Conversão de UTF-16LE do Windows (sem BOM) para UTF-8 do Unix:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:733 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1328,12 +1406,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:735 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Conversão de UTF-8 Unix para UTF-8 do Windows com BOM:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:737 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1343,12 +1421,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:739 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Conversão de UTF-8 do Unix para UTF-16 do Windows:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:741 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1358,47 +1436,49 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:719 +#: dos2unix.pod:743 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:721 -msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." +#: dos2unix.pod:745 +#, fuzzy +#| msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." +msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." msgstr "GB18030 é um padrão governamental chinês. Um subconjunto obrigatório do padrão GB18030 é exigido oficialmente para todos os produtos de software vendidos na China. Veja também L." #. type: textblock -#: dos2unix.pod:725 +#: dos2unix.pod:749 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "GB18030 é completamente compatível com Unicode e pode ser considerado um formato de transformação de unicode. Assim como UTF-8, GB18030 é compatível com ASCII. GB18030 também é compatível com a página de código 936 do Windows, também conhecida como GBK." #. type: textblock -#: dos2unix.pod:729 +#: dos2unix.pod:753 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C to get the list of supported locales." msgstr "No Unix/Linux, arquivos UTF-16 são convertidos para GB18030 quando a codificação da localização é definida para GB18030. Note que isso vai funcionar apenas se o sistemas oferecer suporte à localização. Use o comando C para obter a lista de localizações às quais há suporte." #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:757 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "No Windows, você precisa usar a opção C<-gb> para converter arquivos UTF-16 para GB18030." #. type: textblock -#: dos2unix.pod:735 +#: dos2unix.pod:759 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "Arquivos codificados em GB18030 possuem uma marca de ordem de bytes, como arquivos Unicode." #. type: =head1 -#: dos2unix.pod:737 +#: dos2unix.pod:761 msgid "EXAMPLES" msgstr "EXEMPLOS" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:763 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Lê a entrada da \"stdin\" e escreve a saída para \"stdout\":" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:765 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1410,12 +1490,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:744 +#: dos2unix.pod:768 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "Converte e substitui a.txt. Converte e substitui b.txt:" #. type: verbatim -#: dos2unix.pod:746 +#: dos2unix.pod:770 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1427,12 +1507,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:749 +#: dos2unix.pod:773 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "Converte e substitui a.txt no modo de conversão ascii:" #. type: verbatim -#: dos2unix.pod:751 +#: dos2unix.pod:775 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1442,12 +1522,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:753 +#: dos2unix.pod:777 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "Converte e substitui a.txt no modo de conversão ascii. Converte e substitui b.txt no modo de conversão 7bit:" #. type: verbatim -#: dos2unix.pod:756 +#: dos2unix.pod:780 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1461,12 +1541,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:760 +#: dos2unix.pod:784 msgid "Convert a.txt from Mac to Unix format:" msgstr "Converte a.txt do formato do Mac para Unix:" #. type: verbatim -#: dos2unix.pod:762 +#: dos2unix.pod:786 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1478,12 +1558,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:765 +#: dos2unix.pod:789 msgid "Convert a.txt from Unix to Mac format:" msgstr "Converte a.txt do formato do Unix para Mac:" #. type: verbatim -#: dos2unix.pod:767 +#: dos2unix.pod:791 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1495,12 +1575,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:770 +#: dos2unix.pod:794 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "Converte e substitui a.txt enquanto mantém a marca de data original:" #. type: verbatim -#: dos2unix.pod:772 +#: dos2unix.pod:796 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1512,12 +1592,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:775 +#: dos2unix.pod:799 msgid "Convert a.txt and write to e.txt:" msgstr "Converte a.txt e escreve para e.txt:" #. type: verbatim -#: dos2unix.pod:777 +#: dos2unix.pod:801 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1527,12 +1607,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:779 +#: dos2unix.pod:803 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "Converte a.txt e escreve para e.txt, mantém a marca de data de e.txt igual a a.txt:" #. type: verbatim -#: dos2unix.pod:781 +#: dos2unix.pod:805 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1542,12 +1622,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:783 +#: dos2unix.pod:807 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "Converte e substitui a.txt. Converte b.txt e escreve para e.txt:" #. type: verbatim -#: dos2unix.pod:785 +#: dos2unix.pod:809 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1559,12 +1639,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:788 +#: dos2unix.pod:812 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "Converte c.txt e escreve para e.txt. Converte e substitui a.txt. Converte e substitui b.txt. Converte d.txt e escreve para f.txt:" #. type: verbatim -#: dos2unix.pod:791 +#: dos2unix.pod:815 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1574,17 +1654,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:793 +#: dos2unix.pod:817 msgid "RECURSIVE CONVERSION" msgstr "CONVERSÃO RECURSIVA" #. type: textblock -#: dos2unix.pod:795 +#: dos2unix.pod:819 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "Em um shell Unix, os comandos find(1) e xargs(1) podem ser usados para executar recursivamente o dos2unix em todos os arquivos texto em uma árvore de diretórios. Por exemplo, para converter todos os arquivos .txt na árvore de diretórios sob o diretório atual, digite:" #. type: verbatim -#: dos2unix.pod:799 +#: dos2unix.pod:823 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1594,12 +1674,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:801 +#: dos2unix.pod:825 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "A opção do find(1) C<-print0> e a opção correspondente do xargs(1) C<-0> são necessárias quando houver arquivos com espaços ou aspas no nome. Do contrário, essas opções podem ser omitidas. Outra alternativa é usar find(1) com a opção C<-exec>:" #. type: verbatim -#: dos2unix.pod:805 +#: dos2unix.pod:829 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1609,12 +1689,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:807 +#: dos2unix.pod:831 msgid "In a Windows Command Prompt the following command can be used:" msgstr "Em um Prompt de Comando do Windows o seguinte comando pode ser usado:" #. type: verbatim -#: dos2unix.pod:809 +#: dos2unix.pod:833 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1624,12 +1704,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:811 +#: dos2unix.pod:835 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "Usuários do PowerShell podem usar o seguinte comando no Windows PowerShell:" #. type: verbatim -#: dos2unix.pod:813 +#: dos2unix.pod:837 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1639,22 +1719,22 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:816 +#: dos2unix.pod:840 msgid "LOCALIZATION" msgstr "LOCALIZAÇÃO" #. type: =item -#: dos2unix.pod:820 +#: dos2unix.pod:844 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:822 +#: dos2unix.pod:846 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "O idioma primário é selecionado com a variável de ambiente LANG. A variável LANG consiste em várias partes. A primeira parte está em letras pequenas no código do idioma. A segunda parte é opcional e é o código do país em letras maiúsculo, precedida de um sublinhado. Há também uma terceira parte opcional: codificação de caractere, precedida com um ponto. Alguns exemplos para shells do tipo padrão POSIX:" #. type: verbatim -#: dos2unix.pod:829 +#: dos2unix.pod:853 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1676,47 +1756,51 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:837 -msgid "For a complete list of language and country codes see the gettext manual: L" +#: dos2unix.pod:861 +#, fuzzy +#| msgid "For a complete list of language and country codes see the gettext manual: L" +msgid "For a complete list of language and country codes see the gettext manual: L" msgstr "Para a lista completa de códigos de idioma e país, veja o manual do gettext: L" #. type: textblock -#: dos2unix.pod:840 +#: dos2unix.pod:864 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "Nos sistemas Unix, você pode usar o comando locale(1) para obter informação específica da localização." #. type: =item -#: dos2unix.pod:843 +#: dos2unix.pod:867 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:845 -msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" +#: dos2unix.pod:869 +#, fuzzy +#| msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" +msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" msgstr "Com a variável de ambiente LANGUAGE, você pode especificar uma lista de prioridades de idiomas, separada por vírgulas. Dos2unix fornece preferência à LANGUAGE sobre LANG. Por exemplo, primeiro holandês e, então, alemão: C. Você primeiro tem que habilitar localização, definindo LANG (ou LC_ALL) para um valor diferente de \"C\", antes que você possa usar uma lista de prioridade de idioma por meio da variável LANGUAGE. Veja também o manual do gettext: L" #. type: textblock -#: dos2unix.pod:853 +#: dos2unix.pod:877 msgid "If you select a language which is not available you will get the standard English messages." msgstr "Se você selecionou um idioma que não está disponível, você vai terá as mensagens em inglês (padrão)." #. type: =item -#: dos2unix.pod:857 +#: dos2unix.pod:881 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:859 +#: dos2unix.pod:883 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C. Option B<--version> will display the LOCALEDIR that is used." msgstr "Com a variável de ambiente DOS2UNIX_LOCALEDIR, o LOCALEDIR definido durante a compilação pode ser sobrescrito. LOCALEDIR é usada para localizar os arquivos de idioma. O valor padrão do GNU é C. A opção B<--version> vai exibir o LOCALEDIR que é usado." #. type: textblock -#: dos2unix.pod:864 +#: dos2unix.pod:888 msgid "Example (POSIX shell):" msgstr "Exemplo (shell POSIX):" #. type: verbatim -#: dos2unix.pod:866 +#: dos2unix.pod:890 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1726,75 +1810,98 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:871 +#: dos2unix.pod:895 msgid "RETURN VALUE" msgstr "VALOR RETORNADO" #. type: textblock -#: dos2unix.pod:873 +#: dos2unix.pod:897 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "No sucesso, zero é retornado. Quando um erro de sistema ocorre, o último erro de sistema será retornado. Para outros erros, 1 é retornado." #. type: textblock -#: dos2unix.pod:876 +#: dos2unix.pod:900 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "O valor retornado é sempre zero no modo quieto, exceto quando opções de linha de comando erradas são usadas." #. type: =head1 -#: dos2unix.pod:879 +#: dos2unix.pod:903 msgid "STANDARDS" msgstr "PADRÕES" #. type: textblock -#: dos2unix.pod:881 -msgid "L" +#: dos2unix.pod:905 +#, fuzzy +#| msgid "L" +msgid "L" msgstr "L" #. type: textblock -#: dos2unix.pod:883 -msgid "L" +#: dos2unix.pod:907 +#, fuzzy +#| msgid "L" +msgid "L" msgstr "L" #. type: textblock -#: dos2unix.pod:885 -msgid "L" +#: dos2unix.pod:909 +#, fuzzy +#| msgid "L" +msgid "L" msgstr "L" #. type: textblock -#: dos2unix.pod:887 -msgid "L" +#: dos2unix.pod:911 +#, fuzzy +#| msgid "L" +msgid "L" msgstr "L" #. type: =head1 -#: dos2unix.pod:889 +#: dos2unix.pod:913 msgid "AUTHORS" msgstr "AUTORES" #. type: textblock -#: dos2unix.pod:891 +#: dos2unix.pod:915 msgid "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer)" msgstr "Benjamin Lin - Bernd Johannes Wuebben (modo mac2unix) - , Christian Wurll (adiciona nova linha extra) - , Erwin Waterlander - (mantenedor)" #. type: textblock -#: dos2unix.pod:896 -msgid "Project page: L" +#: dos2unix.pod:920 +#, fuzzy +#| msgid "Project page: L" +msgid "Project page: L" msgstr "Página do projeto: L" #. type: textblock -#: dos2unix.pod:898 -msgid "SourceForge page: L" +#: dos2unix.pod:922 +#, fuzzy +#| msgid "SourceForge page: L" +msgid "SourceForge page: L" msgstr "Página do SourceForge: L" #. type: =head1 -#: dos2unix.pod:900 +#: dos2unix.pod:924 msgid "SEE ALSO" msgstr "VEJA TAMBÉM" #. type: textblock -#: dos2unix.pod:902 +#: dos2unix.pod:926 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" +#, fuzzy +#~| msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." +#~ msgid "Although the name of this mode is B, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." +#~ msgstr "Apesar do nome deste modo ser ASCII, o qual é um padrão de 7 bits, o modo é em verdade 8 bits. Sempre use este modo quando quiser converter arquivos Unicode UTF-8." + +#~ msgid "Convert only line breaks. This is the default conversion mode." +#~ msgstr "Converte apenas as quebras de linhas. Esse é o modo de conversão padrão." + +#~ msgid "In mode C only line breaks are converted. This is the default conversion mode." +#~ msgstr "No modo C, apenas as quebras de linha são convertidas. Esse é o modo de conversão padrão." + #~ msgid "" #~ " find -name '*.txt' | xargs dos2unix -ic\n" #~ "\n" diff --git a/dos2unix/po-man/ro.po b/dos2unix/po-man/ro.po index 047d178..ad2add9 100644 --- a/dos2unix/po-man/ro.po +++ b/dos2unix/po-man/ro.po @@ -8,14 +8,16 @@ # Traducerea inițială, făcută de R-GC, pentru versiunea dos2unix 7.3.6-beta4, oct-2022. # Traducerea inițială, făcută de R-GC, pentru versiunea dos2unix 7.4.4-beta4, dec-2022. # Traducerea inițială, făcută de R-GC, pentru versiunea dos2unix 7.5.0-beta5, apr-2023. +# Traducerea inițială, făcută de R-GC, pentru versiunea dos2unix 7.5.2-beta2, noi-2023. +# Traducerea inițială, făcută de R-GC, pentru versiunea dos2unix 7.5.2-beta3, noi-2023. # Actualizare a traducerii pentru versiunea Y, făcută de X,Y(luna-anul). # msgid "" msgstr "" -"Project-Id-Version: dos2unix-man 7.5.0-beta5\n" +"Project-Id-Version: dos2unix-man 7.5.2-beta3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-23 10:34+0200\n" -"PO-Revision-Date: 2023-04-26 18:44+0200\n" +"POT-Creation-Date: 2023-11-27 22:01+0100\n" +"PO-Revision-Date: 2023-11-29 16:19+0100\n" "Last-Translator: Remus-Gabriel Chelu \n" "Language-Team: Romanian \n" "Language: ro\n" @@ -163,8 +165,8 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:121 -msgid "Convert only line breaks. This is the default conversion mode." -msgstr "Convertește numai întreruperile de linie. Acesta este modul de conversie implicit." +msgid "Default conversion mode. See also section CONVERSION MODES." +msgstr "Modul de conversie implicit (între setul de caractere DOS și ISO-8859-1). Consultați, de asemenea, secțiunea MODURI DE CONVERSIE." #. type: =item #: dos2unix.pod:123 @@ -417,7 +419,7 @@ msgid "The following information is printed, in this order: number of DOS line b msgstr "Sunt afișate următoarele informații, în această ordine: numărul de întreruperi de linie DOS, numărul de întreruperi de linie Unix, numărul de întreruperi de linie Mac, marcajul de ordine a octeților, text sau binar, numele fișierului." #. type: textblock -#: dos2unix.pod:274 +#: dos2unix.pod:274 dos2unix.pod:290 msgid "Example output:" msgstr "Exemplu de ieșire:" @@ -452,86 +454,122 @@ msgstr "Rețineți că, uneori, un fișier binar poate fi confundat cu un fișie #. type: textblock #: dos2unix.pod:287 +msgid "If in addition option C<-e> or C<--add-eol> is used also the type of the line break of the last line is printed, or C if there is none." +msgstr "Dacă, în plus, se utilizează opțiunea C<-e> sau C<--add-eol>, se imprimă, de asemenea, tipul întreruperii de linie de pe ultima linie sau C, dacă nu există." + +#. type: verbatim +#: dos2unix.pod:292 +#, no-wrap +msgid "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" +msgstr "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:297 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Opțional, pot fi adăugate fanioane suplimentare pentru a modifica rezultatul. Se pot adăuga unul sau mai multe fanioane." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:302 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:304 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "Afișează liniile de informații ale fișierului urmate de un caracter null în loc de un caracter de linie nouă. Acest lucru permite interpretarea corectă a numelor de fișiere cu spații sau ghilimele atunci când este utilizat fanionul „c”. Utilizați acest fanion în combinație cu opțiunea xargs(1) C<-0> sau C<--null>." #. type: =item -#: dos2unix.pod:299 +#: dos2unix.pod:309 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:301 +#: dos2unix.pod:311 msgid "Print number of DOS line breaks." msgstr "Afișează numărul de întreruperi de linie al formatului DOS." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:313 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:315 msgid "Print number of Unix line breaks." msgstr "Afișează numărul de întreruperi de linie al formatului Unix." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:317 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:319 msgid "Print number of Mac line breaks." msgstr "Afișează numărul de întreruperi de linie al formatului Mac." #. type: =item -#: dos2unix.pod:311 +#: dos2unix.pod:321 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:323 msgid "Print the byte order mark." msgstr "Afișează marcajul de ordine a octeților." #. type: =item -#: dos2unix.pod:315 +#: dos2unix.pod:325 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:317 +#: dos2unix.pod:327 msgid "Print if file is text or binary." msgstr "Indică dacă fișierul este text sau binar." #. type: =item -#: dos2unix.pod:319 +#: dos2unix.pod:329 +msgid "B" +msgstr "B" + +#. type: textblock +#: dos2unix.pod:331 +msgid "Print the type of the line break of the last line, or C if there is none." +msgstr "Imprimă tipul întreruperii de linie de pe ultima linie sau C dacă nu există." + +#. type: =item +#: dos2unix.pod:333 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:321 +#: dos2unix.pod:335 msgid "Print only the files that would be converted." msgstr "Afișează numai fișierele care vor fi convertite." #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:337 msgid "With the C flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Cu fanionul C, «dos2unix» va afișa numai fișierele care conțin întreruperi de linie DOS, «unix2dos» va afișa numai numele de fișiere care au întreruperi de linie Unix." +#. type: textblock +#: dos2unix.pod:340 +msgid "If in addition option C<-e> or C<--add-eol> is used also the files that lack a line break on the last line will be printed." +msgstr "Dacă, în plus, se utilizează opțiunea C<-e> sau C<--add-eol>, vor fi afișate și fișierele cărora le lipsește o întrerupere de linie pe ultima linie." + #. type: =item -#: dos2unix.pod:326 +#: dos2unix.pod:343 msgid "B" msgstr "B" @@ -539,32 +577,32 @@ msgstr "B" # traducerea mesajului, este o adaptare (la realitate), # a mesajului original. #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:345 msgid "Print a header." msgstr "Afișează titlul." #. type: =item -#: dos2unix.pod:330 +#: dos2unix.pod:347 msgid "B

" msgstr "B

" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:349 msgid "Show file names without path." -msgstr "Afișează numele fișierelor fără cale." +msgstr "Afișează (doar) numele fișierelor, fără ruta către ele." #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:353 msgid "Examples:" msgstr "Exemple:" #. type: textblock -#: dos2unix.pod:338 +#: dos2unix.pod:355 msgid "Show information for all *.txt files:" msgstr "Afișează informații pentru toate fișierele *.txt:" #. type: verbatim -#: dos2unix.pod:340 +#: dos2unix.pod:357 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -574,12 +612,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:342 +#: dos2unix.pod:359 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Afișează doar numărul de întreruperi de linie DOS și de întreruperi de linie Unix:" #. type: verbatim -#: dos2unix.pod:344 +#: dos2unix.pod:361 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -589,12 +627,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:346 +#: dos2unix.pod:363 msgid "Show only the byte order mark:" msgstr "Afișează doar marcajul de ordine a octeților:" #. type: verbatim -#: dos2unix.pod:348 +#: dos2unix.pod:365 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -604,12 +642,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:350 +#: dos2unix.pod:367 msgid "List the files that have DOS line breaks:" msgstr "Listează fișierele care au întreruperi de linie DOS:" #. type: verbatim -#: dos2unix.pod:352 +#: dos2unix.pod:369 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -619,12 +657,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:354 +#: dos2unix.pod:371 msgid "List the files that have Unix line breaks:" msgstr "Listează fișierele care au întreruperi de linie Unix:" #. type: verbatim -#: dos2unix.pod:356 +#: dos2unix.pod:373 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -634,12 +672,27 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:358 +#: dos2unix.pod:375 +msgid "List the files that have DOS line breaks or lack a line break on the last line:" +msgstr "Listează fișierele care au întreruperi de linie DOS sau care nu au întreruperi de linie pe ultima linie:" + +#. type: verbatim +#: dos2unix.pod:377 +#, no-wrap +msgid "" +" dos2unix -e -ic *.txt\n" +"\n" +msgstr "" +" dos2unix -e -ic *.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:379 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "Convertește numai fișierele care au întreruperi de linie DOS și lasă celelalte fișiere neatinse:" #. type: verbatim -#: dos2unix.pod:360 +#: dos2unix.pod:381 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -649,12 +702,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:362 +#: dos2unix.pod:383 msgid "Find text files that have DOS line breaks:" msgstr "Găsește fișiere text care au întreruperi de linie DOS:" #. type: verbatim -#: dos2unix.pod:364 +#: dos2unix.pod:385 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -664,122 +717,122 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:366 +#: dos2unix.pod:387 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:368 +#: dos2unix.pod:389 msgid "Keep the date stamp of output file same as input file." msgstr "Păstrează marcajul de dată al fișierului de ieșire la fel ca al fișierului de intrare." #. type: =item -#: dos2unix.pod:370 +#: dos2unix.pod:391 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:372 +#: dos2unix.pod:393 msgid "Display program's license." msgstr "Afișează licența programului." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:395 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:397 msgid "Add additional newline." msgstr "Adaugă o linie nouă suplimentară." #. type: textblock -#: dos2unix.pod:378 +#: dos2unix.pod:399 msgid "B: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B: Numai întreruperile de linie DOS sunt modificate în două întreruperi de linie Unix. În modul Mac, numai întreruperile de linie Mac sunt modificate în două întreruperi de linie Unix." #. type: textblock -#: dos2unix.pod:382 +#: dos2unix.pod:403 msgid "B: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B: Numai întreruperile de linie Unix sunt modificate în două întreruperi de linie DOS. În modul Mac, întreruperile de linie Unix sunt modificate în două întreruperi de linie Mac." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:406 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:408 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "Scrie un marcaj de ordine a octeților (BOM) în fișierul de ieșire. În mod implicit, este scris un marcaj de ordine a octeților UTF-8." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:411 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "Când fișierul de intrare este UTF-16 și este utilizată opțiunea C<-u>, va fi scris un marcaj de ordine a octeților UTF-16." #. type: textblock -#: dos2unix.pod:393 +#: dos2unix.pod:414 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "Nu utilizați niciodată această opțiune când codificarea de ieșire este alta decât UTF-8, UTF-16 sau GB18030. Vedeți, de asemenea, secțiunea UNICODE." #. type: =item -#: dos2unix.pod:397 +#: dos2unix.pod:418 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile FIȘIER_INTRARE FIȘIER_IEȘIRE ...>" #. type: textblock -#: dos2unix.pod:399 +#: dos2unix.pod:420 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I be used or you I lose your files." msgstr "Modul de fișier nou. Convertiți fișierul FIȘIER_INTRARE și scrieți rezultatul în fișierul FIȘIER_IEȘIRE. Numele fișierelor trebuie să fie date în perechi, iar numele cu metacaractere ar trebui să I fi folosite sau v-ați puteai pierde fișierele." #. type: textblock -#: dos2unix.pod:403 +#: dos2unix.pod:424 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "Persoana care începe conversia în modul-fișier_nou (pereche) va fi proprietarul fișierului convertit. Permisiunile de citire/scriere ale noului fișier vor fi permisiunile fișierului original minus umask(1) al persoanei care execută conversia." #. type: =item -#: dos2unix.pod:408 +#: dos2unix.pod:429 msgid "B<--no-allow-chown>" msgstr "B<--no-allow-chown>" #. type: textblock -#: dos2unix.pod:410 +#: dos2unix.pod:431 msgid "Don't allow file ownership change in old file mode (default)." msgstr "Nu permite schimbarea proprietarului fișierului în modul-fișier_vechi (implicit)." #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:433 msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." msgstr "Anulează conversia atunci când utilizatorul și/sau grupul proprietar al fișierului original nu poate fi păstrat în modul-fișier_vechi. A se vedea, de asemenea, opțiunile C<-o> și C<-n>. Această opțiune este disponibilă doar dacă «dos2unix» are suport pentru păstrarea dreptului de proprietate asupra fișierelor de către utilizator și grup." #. type: =item -#: dos2unix.pod:417 +#: dos2unix.pod:438 msgid "B<--no-add-eol>" msgstr "B<--no-add-eol>" #. type: textblock -#: dos2unix.pod:419 +#: dos2unix.pod:440 msgid "Do not add a line break to the last line if there isn't one." msgstr "Nu adaugă o întrerupere de linie la ultima linie, dacă nu există una." #. type: =item -#: dos2unix.pod:421 +#: dos2unix.pod:442 msgid "B<-O, --to-stdout>" msgstr "B<-O, --to-stdout>" #. type: textblock -#: dos2unix.pod:423 +#: dos2unix.pod:444 msgid "Write to standard output, like a Unix filter. Use option C<-o> to go back to old file (in-place) mode." msgstr "Scrie la ieșirea standard, ca un filtru Unix. Folosiți opțiunea C<-o> pentru a reveni la modul-fișier_vechi (în același loc / în același fișier)." #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:447 msgid "Combined with option C<-e> files can be properly concatenated. No merged last and first lines, and no Unicode byte order marks in the middle of the concatenated file. Example:" msgstr "În combinație cu opțiunea C<-e>, fișierele pot fi concatenate în mod corespunzător. Nu se fuzionează ultima și prima linie și nici marcajele de ordine a octeților (BOM) Unicode în mijlocul fișierului concatenat. Exemplu:" #. type: verbatim -#: dos2unix.pod:430 +#: dos2unix.pod:451 #, no-wrap msgid "" " dos2unix -e -O file1.txt file2.txt > output.txt\n" @@ -789,32 +842,32 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:432 +#: dos2unix.pod:453 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile FIȘIER ...>" #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:455 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "Modul fișier vechi. Convertește fișierul FIȘIER și suprascrie rezultatul în el. Programul rulează implicit în acest mod. Pot fi folosite nume cu metacaractere." #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:458 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "În modul-fișier_vechi (în același loc / în același fișier), fișierul convertit primește același proprietar, grup și permisiuni de citire/scriere ca fișierul original. De asemenea, atunci când fișierul este convertit de un alt utilizator care are permisiuni de scriere în fișier (de exemplu, utilizatorul root). Conversia va fi anulată atunci când nu este posibil să se păstreze valorile originale. Schimbarea proprietarului ar putea însemna că proprietarul inițial nu mai poate citi fișierul. Schimbarea grupului ar putea reprezenta un risc de securitate, fișierul ar putea fi făcut vizibil pentru persoanele cărora nu este destinat. Păstrarea permisiunilor de proprietar, de grup și de citire/scriere este acceptată numai în Unix." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:467 msgid "To check if dos2unix has support for preserving the user and group ownership of files type C." msgstr "Pentru a verifica dacă «dos2unix» are suport pentru păstrarea proprietății utilizatorului și grupului de fișiere, tastați C." #. type: textblock -#: dos2unix.pod:449 +#: dos2unix.pod:470 msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" msgstr "Conversia se face întotdeauna printr-un fișier temporar. Când apare o eroare la jumătatea conversiei, fișierul temporar este șters și fișierul original rămâne intact. Când conversia are succes, fișierul original este înlocuit cu fișierul temporar. Este posibil să aveți permisiunea de scriere în fișierul original, dar nu aveți permisiunea de a pune aceleași proprietăți de proprietate ale utilizatorului și/sau grupului asupra fișierului temporar ca cele pe care le are fișierul original. Aceasta înseamnă că nu puteți păstra utilizatorul și/sau grupul proprietar al fișierului original. În acest caz, puteți utiliza opțiunea C<--allow-chown> pentru a continua conversia:" #. type: verbatim -#: dos2unix.pod:458 +#: dos2unix.pod:479 #, no-wrap msgid "" " dos2unix --allow-chown foo.txt\n" @@ -824,12 +877,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:460 +#: dos2unix.pod:481 msgid "Another option is to use new file mode:" msgstr "O altă opțiune este să utilizați modul-fișier_nou:" #. type: verbatim -#: dos2unix.pod:462 +#: dos2unix.pod:483 #, no-wrap msgid "" " dos2unix -n foo.txt foo.txt\n" @@ -839,227 +892,227 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:485 msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." msgstr "Avantajul opțiunii C<--allow-chown> este că puteți folosi metacaractere, iar proprietățile de proprietate vor fi păstrate atunci când este posibil." #. type: =item -#: dos2unix.pod:467 +#: dos2unix.pod:488 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:469 +#: dos2unix.pod:490 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Modul silențios. Suprimă toate avertismentele și mesajele. Valoarea returnată este zero. Cu excepția cazului în care sunt utilizate opțiuni greșite în linia de comandă." #. type: =item -#: dos2unix.pod:472 +#: dos2unix.pod:493 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:495 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "Elimină marcajul de ordine a octeților (BOM). Nu scrie un marcaj de ordine a octeților în fișierul de ieșire. Acesta este comportamentul implicit la conversia întreruperilor de linie Unix. A se vedea, de asemenea, opțiunea C<-b>." #. type: =item -#: dos2unix.pod:478 +#: dos2unix.pod:499 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:501 msgid "Skip binary files (default)." msgstr "Omite fișierele binare (implicit)." #. type: textblock -#: dos2unix.pod:482 +#: dos2unix.pod:503 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "Omiterea fișierelor binare se face pentru a evita greșelile accidentale. Rețineți că detectarea fișierelor binare nu este 100% sigură. Fișierele de intrare sunt scanate pentru simboluri binare care de obicei nu se găsesc în fișierele text. Este posibil ca un fișier binar să conțină doar caractere de text normale. Un astfel de fișier binar va fi văzut din greșeală ca un fișier text." #. type: =item -#: dos2unix.pod:488 +#: dos2unix.pod:509 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:490 +#: dos2unix.pod:511 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "Păstrează codificarea UTF-16 originală a fișierului de intrare. Fișierul de ieșire va fi scris în aceeași codare UTF-16, little sau big endian, ca și fișierul de intrare. Acest lucru previne transformarea în UTF-8. Un marcaj de ordine a octeților UTF-16 va fi scris în consecință. Această opțiune poate fi dezactivată cu opțiunea C<-ascii>." #. type: =item -#: dos2unix.pod:495 +#: dos2unix.pod:516 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:497 +#: dos2unix.pod:518 msgid "Assume that the input file format is UTF-16LE." msgstr "Presupune că formatul fișierului de intrare este UTF-16LE." #. type: textblock -#: dos2unix.pod:499 +#: dos2unix.pod:520 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "Când există un marcaj de ordine a octeților în fișierul de intrare, marcajul de ordine a octeților are prioritate față de această opțiune." #. type: textblock -#: dos2unix.pod:502 +#: dos2unix.pod:523 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "Când ați făcut o presupunere greșită (fișierul de intrare nu era în format UTF-16LE) și conversia a reușit, veți obține un fișier de ieșire UTF-8 cu text greșit. Puteți anula conversia greșită cu iconv(1) prin conversia fișierului de ieșire UTF-8 înapoi în UTF-16LE. Acest lucru va reface fișierul original." #. type: textblock -#: dos2unix.pod:507 +#: dos2unix.pod:528 msgid "The assumption of UTF-16LE works as a I. By switching to the default I mode the UTF-16LE assumption is turned off." msgstr "Presupunerea UTF-16LE funcționează ca un I. Prin trecerea la modul I implicit, presupunerea UTF-16LE este dezactivată." #. type: =item -#: dos2unix.pod:510 +#: dos2unix.pod:531 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:512 +#: dos2unix.pod:533 msgid "Assume that the input file format is UTF-16BE." msgstr "Presupune că formatul fișierului de intrare este UTF-16BE." #. type: textblock -#: dos2unix.pod:514 +#: dos2unix.pod:535 msgid "This option works the same as option C<-ul>." msgstr "Această opțiune funcționează la fel ca și opțiunea C<-ul>." #. type: =item -#: dos2unix.pod:516 +#: dos2unix.pod:537 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:518 +#: dos2unix.pod:539 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "Afișează mesaje detaliate. Sunt afișate informații suplimentare despre mărcile de ordine ale octeților și cantitatea de întreruperi de linie convertite." #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:542 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:523 +#: dos2unix.pod:544 msgid "Follow symbolic links and convert the targets." msgstr "Urmează legăturile simbolice și convertește țintele." #. type: =item -#: dos2unix.pod:525 +#: dos2unix.pod:546 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:527 +#: dos2unix.pod:548 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "Înlocuiește legăturile simbolice cu fișierele convertite (fișierele țintă originale rămân neschimbate)." #. type: =item -#: dos2unix.pod:530 +#: dos2unix.pod:551 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:532 +#: dos2unix.pod:553 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Păstrează legăturile simbolice și țintele neschimbate (implicit)." #. type: =item -#: dos2unix.pod:534 +#: dos2unix.pod:555 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:536 +#: dos2unix.pod:557 msgid "Display version information and exit." msgstr "Afișează informațiile despre versiune și iese." #. type: =head1 -#: dos2unix.pod:540 +#: dos2unix.pod:561 msgid "MAC MODE" msgstr "MODUL MAC" #. type: textblock -#: dos2unix.pod:542 -msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." -msgstr "În modul normal, întreruperile de linie sunt convertite din DOS în Unix și invers. Întreruperile de linie Mac nu sunt convertite." +#: dos2unix.pod:563 +msgid "By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." +msgstr "În mod implicit, salturile (întreruperile) de linie sunt convertite din DOS în Unix și invers. Întreruperile de linie Mac nu sunt convertite." #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:566 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "În modul Mac, întreruperile de linie sunt convertite din Mac în Unix și invers. Întreruperile de linie DOS nu sunt modificate." #. type: textblock -#: dos2unix.pod:548 +#: dos2unix.pod:569 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C or C." msgstr "Pentru a rula în modul Mac, utilizați opțiunea din linie de comandă C<-c mac> sau utilizați comenzile C sau C." #. type: =head1 -#: dos2unix.pod:551 +#: dos2unix.pod:572 msgid "CONVERSION MODES" msgstr "MODURI DE CONVERSIE" #. type: =item -#: dos2unix.pod:555 +#: dos2unix.pod:576 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:557 -msgid "In mode C only line breaks are converted. This is the default conversion mode." -msgstr "În modul C sunt convertite doar întreruperile de linie. Acesta este modul de conversie implicit." +#: dos2unix.pod:578 +msgid "This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling B mode disables B<7bit> and B mode." +msgstr "Acesta este modul de conversie implicit. Acest mod este destinat conversiei fișierelor codificate ASCII și compatibile cu ASCII, cum ar fi UTF-8. Activarea modului B dezactivează modurile B<7bit> și B." #. type: textblock -#: dos2unix.pod:560 -msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." -msgstr "Deși numele acestui mod este ASCII, care este un standard de 7 biți, modul actual este de 8 biți. Utilizați întotdeauna acest mod când convertiți fișiere Unicode UTF-8." +#: dos2unix.pod:582 +msgid "If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has UTF-16 support type C. See also section UNICODE." +msgstr "Dacă «dos2unix» are suport UTF-16, fișierele codificate UTF-16 sunt convertite la codificarea caracterelor locale curente pe sistemele POSIX și la UTF-8 pe Windows. Activarea modului B dezactivează opțiunea de păstrare a codificării UTF-16 (C<-u>) și opțiunile de asumare a intrării UTF-16 (C<-ul> și C<-ub>). Pentru a vedea dacă «dos2unix» are suport UTF-16, tastați C. A se vedea și secțiunea UNICODE." #. type: =item -#: dos2unix.pod:564 +#: dos2unix.pod:588 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:566 +#: dos2unix.pod:590 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "În acest mod, toate caracterele de 8 biți non-ASCII (cu valori de la 128 la 255) sunt convertite într-un spațiu de 7 biți." #. type: =item -#: dos2unix.pod:569 +#: dos2unix.pod:593 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:571 +#: dos2unix.pod:595 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Caracterele sunt convertite între un set de caractere DOS (pagina de cod) și un set de caractere ISO ISO-8859-1 (Latin-1) în Unix. Caracterele DOS fără echivalent ISO-8859-1, pentru care conversia nu este posibilă, sunt convertite într-un punct. Același lucru este valabil și pentru caracterele ISO-8859-1 fără omolog în DOS." #. type: textblock -#: dos2unix.pod:576 +#: dos2unix.pod:600 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "Când este folosită numai opțiunea C<-iso>, «dos2unix» va încerca să determine pagina de cod activă. Când acest lucru nu este posibil, «dos2unix» va folosi pagina de cod implicită CP437, care este folosită în principal în SUA. Pentru a forța o anumită pagină de coduri, utilizați opțiunile C<-437> (SUA), C<-850> (Europa de Vest), C<-860> (Portugheză), C<-863> (Franceză Canadiană) sau C<- 865> (Scandinavă). Pagina de coduri CP1252 (Europa de Vest) Windows este, de asemenea, acceptată cu opțiunea C<-1252>. Pentru alte pagini de cod, utilizați «dos2unix» în combinație cu iconv(1). «iconv» poate converti o listă lungă de codificări de caractere. Puteți vizualiza această listă rulând comanda: «iconv -l»." #. type: textblock -#: dos2unix.pod:585 +#: dos2unix.pod:609 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "Nu utilizați niciodată conversia ISO pe fișiere text Unicode. Acesta va deteriora fișierele codificate UTF-8." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:611 msgid "Some examples:" msgstr "Câteva exemple:" #. type: textblock -#: dos2unix.pod:589 +#: dos2unix.pod:613 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Convertește din pagina de cod implicită DOS în Latin-1 Unix:" #. type: verbatim -#: dos2unix.pod:591 +#: dos2unix.pod:615 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -1069,12 +1122,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:593 +#: dos2unix.pod:617 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Convertește din CP850 DOS în Latin-1 Unix:" #. type: verbatim -#: dos2unix.pod:595 +#: dos2unix.pod:619 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -1084,12 +1137,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:597 +#: dos2unix.pod:621 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Convertește din CP1252 Windows în Latin-1 Unix:" #. type: verbatim -#: dos2unix.pod:599 +#: dos2unix.pod:623 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -1099,12 +1152,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:601 +#: dos2unix.pod:625 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Convertește din CP1252 Windows în UTF-8 (Unicode) Unix:" #. type: verbatim -#: dos2unix.pod:603 +#: dos2unix.pod:627 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -1114,12 +1167,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:605 +#: dos2unix.pod:629 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Convertește din Latin-1 Unix la pagina de cod implicită DOS:" #. type: verbatim -#: dos2unix.pod:607 +#: dos2unix.pod:631 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -1129,12 +1182,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:609 +#: dos2unix.pod:633 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Convertește din Latin-1 Unix în CP850 DOS:" #. type: verbatim -#: dos2unix.pod:611 +#: dos2unix.pod:635 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1144,12 +1197,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:637 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Convertește din Latin-1 Unix în CP1252 Windows:" #. type: verbatim -#: dos2unix.pod:615 +#: dos2unix.pod:639 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1159,12 +1212,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:617 +#: dos2unix.pod:641 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Convertește din UTF-8 (Unicode) Unix în CP1252 Windows:" #. type: verbatim -#: dos2unix.pod:619 +#: dos2unix.pod:643 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1174,142 +1227,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:621 +#: dos2unix.pod:645 msgid "See also L and L." msgstr "Consultați de asemenea L și L." #. type: =head1 -#: dos2unix.pod:626 +#: dos2unix.pod:650 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:628 +#: dos2unix.pod:652 msgid "Encodings" msgstr "Codificări" #. type: textblock -#: dos2unix.pod:630 +#: dos2unix.pod:654 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Există diferite codificări Unicode. În Unix și Linux fișierele Unicode sunt de obicei codificate în codificarea UTF-8. În Windows, fișierele text Unicode pot fi codificate în UTF-8, UTF-16 sau UTF-16 big-endian, dar sunt în mare parte codificate în formatul UTF-16." #. type: =head2 -#: dos2unix.pod:635 +#: dos2unix.pod:659 msgid "Conversion" msgstr "Conversie" #. type: textblock -#: dos2unix.pod:637 -msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." -msgstr "Fișierele text Unicode pot avea întreruperi de linie DOS, Unix sau Mac, ca și fișierele text obișnuite." +#: dos2unix.pod:661 +msgid "Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files." +msgstr "Fișierele text Unicode pot avea întreruperi de linie DOS, Unix sau Mac, ca și fișierele text ASCII." #. type: textblock -#: dos2unix.pod:640 +#: dos2unix.pod:664 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Toate versiunile de «dos2unix» și «unix2dos» pot converti fișiere codificate în formatul UTF-8, deoarece UTF-8 a fost conceput pentru compatibilitate cu ASCII." #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:667 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C." msgstr "«dos2unix» și «unix2dos» cu suport Unicode UTF-16, pot citi fișiere text codificate UTF-16 little și big endian. Pentru a vedea dacă «dos2unix» a fost construit cu suport UTF-16, tastați: C." #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:671 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "În Unix/Linux, fișierele codificate UTF-16 sunt convertite în codificarea caracterelor locale. Utilizați comanda locale(1) pentru a afla care este codificarea caracterelor stabilită de localizare. Atunci când conversia nu este posibilă, va apărea o eroare de conversie și fișierul va fi omis." #. type: textblock -#: dos2unix.pod:652 +#: dos2unix.pod:676 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "În Windows, fișierele UTF-16 sunt convertite în mod implicit în UTF-8. Fișierele text formatate UTF-8 sunt bine acceptate atât în Windows, cât și în Unix/Linux." #. type: textblock -#: dos2unix.pod:655 +#: dos2unix.pod:679 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "Codificările UTF-16 și UTF-8 sunt pe deplin compatibile, nu se va pierde text în conversie. Când apare o eroare de conversie din UTF-16 în UTF-8, de exemplu când fișierul de intrare UTF-16 conține o eroare, fișierul va fi omis." #. type: textblock -#: dos2unix.pod:659 +#: dos2unix.pod:683 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "Când se utilizează opțiunea C<-u>, fișierul de ieșire va fi scris în aceeași codificare UTF-16 ca și fișierul de intrare. Opțiunea C<-u> împiedică conversia în UTF-8." #. type: textblock -#: dos2unix.pod:662 +#: dos2unix.pod:686 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "«dos2unix» și «unix2dos» nu au nicio opțiune de a converti fișierele UTF-8 în UTF-16." #. type: textblock -#: dos2unix.pod:664 +#: dos2unix.pod:688 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "Modurile de conversie ISO și 7 biți nu funcționează pe fișierele UTF-16." #. type: =head2 -#: dos2unix.pod:666 +#: dos2unix.pod:690 msgid "Byte Order Mark" msgstr "Marcajul de ordine a octeților" #. type: textblock -#: dos2unix.pod:668 -msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." -msgstr "În Windows, fișierele text Unicode au de obicei un marcaj de ordine a octeților (BOM), deoarece multe programe Windows (inclusiv Notepad) adaugă marcajul de ordine a octeților în mod implicit. A se vedea, de asemenea, L." +#: dos2unix.pod:692 +msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." +msgstr "În Windows, fișierele text Unicode au de obicei un marcaj de ordine a octeților (BOM), deoarece multe programe Windows (inclusiv Notepad) adaugă marcajul de ordine a octeților în mod implicit. A se vedea, de asemenea, L." #. type: textblock -#: dos2unix.pod:672 +#: dos2unix.pod:696 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "În Unix, fișierele Unicode nu au de obicei un marcaj de ordine a octeților (BOM). Se presupune că fișierele text sunt codificate în codificarea caracterelor stabilită de localizare." #. type: textblock -#: dos2unix.pod:675 +#: dos2unix.pod:699 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "«dos2unix» poate detecta dacă un fișier este în formatul UTF-16 numai dacă fișierul are un marcaj de ordine a octeților (BOM). Când un fișier UTF-16 nu are un marcaj de ordine a octeților, «dos2unix» va vedea fișierul ca un fișier binar." #. type: textblock -#: dos2unix.pod:679 +#: dos2unix.pod:703 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Utilizați opțiunea C<-ul> sau C<-ub> pentru a converti un fișier UTF-16 fără un marcaj de ordine a octeților (BOM)." #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:705 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "«dos2unix» nu scrie în mod implicit niciun marcaj de ordine a octeților (BOM) în fișierul de ieșire. Cu opțiunea C<-b> «dos2unix» scrie un marcaj de ordine a octeților atunci când fișierul de intrare are un marcaj de ordine a octeților." #. type: textblock -#: dos2unix.pod:684 +#: dos2unix.pod:708 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "«unix2dos» scrie implicit un marcaj de ordine a octeților în fișierul de ieșire când fișierul de intrare are un marcaj de ordine a octeților. Utilizați opțiunea C<-r> pentru a elimina un marcaj de ordine a octeților." #. type: textblock -#: dos2unix.pod:687 +#: dos2unix.pod:711 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "«dos2unix» și «unix2dos» scriu întotdeauna un marcaj de ordine a octeților atunci când se utilizează opțiunea C<-m>." #. type: =head2 -#: dos2unix.pod:689 +#: dos2unix.pod:713 msgid "Unicode file names on Windows" msgstr "Nume de fișiere Unicode în Windows" #. type: textblock -#: dos2unix.pod:691 +#: dos2unix.pod:715 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C." msgstr "«dos2unix» are suport opțional pentru citirea și scrierea numelor de fișiere Unicode în linia de comandă Windows. Asta înseamnă că «dos2unix» poate deschide fișiere care au caractere în nume care nu fac parte din pagina de cod ANSI implicită a sistemului. Pentru a vedea dacă «dos2unix» pentru Windows a fost construit cu suport pentru nume de fișier Unicode, tastați: C." #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:721 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "Există unele probleme cu afișarea numelor de fișiere Unicode într-o consolă Windows. Vedeți opțiunea C<-D>, C<--display-enc>. Numele fișierelor pot fi afișate greșit în consolă, dar fișierele vor fi scrise cu numele corect." #. type: =head2 -#: dos2unix.pod:701 +#: dos2unix.pod:725 msgid "Unicode examples" msgstr "Exemple Unicode" #. type: textblock -#: dos2unix.pod:703 +#: dos2unix.pod:727 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Convertește din UTF-16 Windows (fără BOM) în UTF-8 Unix:" #. type: verbatim -#: dos2unix.pod:705 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1319,12 +1372,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:731 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Convertește din UTF-16LE Windows (fără BOM) în UTF-8 Unix:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:733 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1334,12 +1387,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:735 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Convertește din UTF-8 Unix în Windows UTF-8 Windows cu BOM:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:737 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1349,12 +1402,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:739 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Convertește din UTF-8 Unix în UTF-16 Windows:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:741 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1364,47 +1417,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:719 +#: dos2unix.pod:743 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:721 -msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." -msgstr "GB18030 este un standard guvernamental chinez. Un subset obligatoriu al standardului GB18030 este obligatoriu oficial pentru toate produsele software vândute în China. A se vedea, de asemenea, L." +#: dos2unix.pod:745 +msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." +msgstr "GB18030 este un standard guvernamental chinez. Un subset obligatoriu al standardului GB18030 este obligatoriu oficial pentru toate produsele software vândute în China. A se vedea, de asemenea, L." #. type: textblock -#: dos2unix.pod:725 +#: dos2unix.pod:749 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "Standardul GB18030 este pe deplin compatibil cu Unicode și poate fi considerat un format de transformare unicode. La fel ca UTF-8, GB18030 este compatibil cu ASCII. GB18030 este, de asemenea, compatibil cu pagina de cod 936 Windows, cunoscută și sub numele de GBK." #. type: textblock -#: dos2unix.pod:729 +#: dos2unix.pod:753 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C to get the list of supported locales." msgstr "În Unix/Linux, fișierele UTF-16 sunt convertite în GB18030 atunci când codificarea locală este setată la GB18030. Rețineți că acest lucru va funcționa numai dacă localizarea este acceptată de sistem. Utilizați comanda C pentru a obține lista localizărilor acceptate." #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:757 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "În Windows, trebuie să utilizați opțiunea C<-gb> pentru a converti fișierele UTF-16 în GB18030." #. type: textblock -#: dos2unix.pod:735 +#: dos2unix.pod:759 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "Fișierele codificate GB18030 pot avea un marcaj de ordine a octeților, precum fișierele Unicode." #. type: =head1 -#: dos2unix.pod:737 +#: dos2unix.pod:761 msgid "EXAMPLES" msgstr "EXEMPLE" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:763 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Citește intrarea din „stdin” (intrarea standard) și scrie ieșirea la „stdout” (ieșirea standard):" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:765 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1416,12 +1469,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:744 +#: dos2unix.pod:768 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "Convertește și înlocuiește a.txt. Convertește și înlocuiește b.txt:" #. type: verbatim -#: dos2unix.pod:746 +#: dos2unix.pod:770 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1433,12 +1486,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:749 +#: dos2unix.pod:773 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "Convertește și înlocuiește a.txt în modul de conversie ascii:" #. type: verbatim -#: dos2unix.pod:751 +#: dos2unix.pod:775 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1448,12 +1501,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:753 +#: dos2unix.pod:777 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "Convertește și înlocuiește a.txt în modul de conversie ascii, convertește și înlocuiește b.txt în modul de conversie pe 7 biți:" #. type: verbatim -#: dos2unix.pod:756 +#: dos2unix.pod:780 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1467,12 +1520,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:760 +#: dos2unix.pod:784 msgid "Convert a.txt from Mac to Unix format:" msgstr "Convertește a.txt din formatul Mac în formatul Unix:" #. type: verbatim -#: dos2unix.pod:762 +#: dos2unix.pod:786 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1484,12 +1537,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:765 +#: dos2unix.pod:789 msgid "Convert a.txt from Unix to Mac format:" msgstr "Convertește a.txt din formatul Unix în formatul Mac:" #. type: verbatim -#: dos2unix.pod:767 +#: dos2unix.pod:791 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1501,12 +1554,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:770 +#: dos2unix.pod:794 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "Convertește și înlocuiește a.txt, păstrând marcajul original al datei:" #. type: verbatim -#: dos2unix.pod:772 +#: dos2unix.pod:796 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1518,12 +1571,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:775 +#: dos2unix.pod:799 msgid "Convert a.txt and write to e.txt:" msgstr "Convertește a.txt și scrie în e.txt:" #. type: verbatim -#: dos2unix.pod:777 +#: dos2unix.pod:801 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1533,12 +1586,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:779 +#: dos2unix.pod:803 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "Convertește a.txt și scrie în e.txt, și face ca marcajul de dată al lui e.txt să fie la fel cu cel al lui a.txt:" #. type: verbatim -#: dos2unix.pod:781 +#: dos2unix.pod:805 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1548,12 +1601,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:783 +#: dos2unix.pod:807 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "Convertește și înlocuiește a.txt, converteștei b.txt și scrie în e.txt:" #. type: verbatim -#: dos2unix.pod:785 +#: dos2unix.pod:809 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1565,12 +1618,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:788 +#: dos2unix.pod:812 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "Convertește c.txt și scrie în e.txt, convertește și înlocuiește a.txt, convertește și înlocuiește b.txt, convertește d.txt și scrie în f.txt:" #. type: verbatim -#: dos2unix.pod:791 +#: dos2unix.pod:815 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1580,17 +1633,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:793 +#: dos2unix.pod:817 msgid "RECURSIVE CONVERSION" msgstr "CONVERSIE RECURSIVĂ" #. type: textblock -#: dos2unix.pod:795 +#: dos2unix.pod:819 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "Într-un shell Unix, comenzile find(1) și xargs(1) pot să fie folosite pentru a rula «dos2unix» în mod recursiv asupra tuturor fișierele text dintr-un arbore de directoare. De exemplu, pentru a converti toate fișierele .txt din arborele de directoare sub directorul curent, tastați:" #. type: verbatim -#: dos2unix.pod:799 +#: dos2unix.pod:823 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1600,12 +1653,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:801 +#: dos2unix.pod:825 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "Opțiunea find(1) C<-print0> și opțiunea corespunzătoare xargs(1) C<-0> sunt necesare atunci când există fișiere cu spații sau ghilimele în nume. În caz contrar, aceste opțiuni pot fi omise. O altă opțiune este să utilizați find(1) cu opțiunea C<-exec>:" #. type: verbatim -#: dos2unix.pod:805 +#: dos2unix.pod:829 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1615,12 +1668,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:807 +#: dos2unix.pod:831 msgid "In a Windows Command Prompt the following command can be used:" msgstr "Într-un prompt de comandă Windows se poate folosi următoarea comandă:" #. type: verbatim -#: dos2unix.pod:809 +#: dos2unix.pod:833 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1630,12 +1683,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:811 +#: dos2unix.pod:835 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "Utilizatorii de PowerShell pot folosi următoarea comandă a PowerShell de Windows:" #. type: verbatim -#: dos2unix.pod:813 +#: dos2unix.pod:837 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1645,22 +1698,22 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:816 +#: dos2unix.pod:840 msgid "LOCALIZATION" msgstr "LOCALIZAREA" #. type: =item -#: dos2unix.pod:820 +#: dos2unix.pod:844 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:822 +#: dos2unix.pod:846 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "Limba principală este selectată cu variabila de mediu LANG. Variabila LANG constă din mai multe părți. Prima parte este codul limbii cu litere mici. Al doilea este opțional și este codul țării cu majuscule, precedat de un caracter de subliniere. Există, de asemenea, o a treia parte opțională: codificarea caracterelor, precedată de un punct. Câteva exemple pentru shell-uri de tip standard POSIX:" #. type: verbatim -#: dos2unix.pod:829 +#: dos2unix.pod:853 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1682,47 +1735,47 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:837 -msgid "For a complete list of language and country codes see the gettext manual: L" -msgstr "Pentru o listă completă a codurilor de limbă și de țară, consultați manualul «gettext»: L" +#: dos2unix.pod:861 +msgid "For a complete list of language and country codes see the gettext manual: L" +msgstr "Pentru o listă completă a codurilor de limbă și de țară, consultați manualul «gettext»: L" #. type: textblock -#: dos2unix.pod:840 +#: dos2unix.pod:864 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "În sistemele Unix, puteți utiliza comanda locale(1) pentru a obține informații specifice despre localizare." #. type: =item -#: dos2unix.pod:843 +#: dos2unix.pod:867 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:845 -msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" -msgstr "Cu variabila de mediu LANGUAGE puteți specifica o listă cu prioritate de limbi, separate prin două puncte. «dos2unix» dă preferință variabilei LANGUAGE în detrimentul variabilei LANG. De exemplu, mai întâi olandeză și apoi germană: C. Mai întâi trebuie să activați localizarea, definind LANG (sau LC_ALL) la o altă valoare decât „C”, înainte de a putea utiliza o listă cu prioritate de limbă prin variabila LANGUAGE. Consultați și manualul «gettext»: L" +#: dos2unix.pod:869 +msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" +msgstr "Cu variabila de mediu LANGUAGE puteți specifica o listă cu prioritate de limbi, separate prin două puncte. «dos2unix» dă preferință variabilei LANGUAGE în detrimentul variabilei LANG. De exemplu, mai întâi olandeză și apoi germană: C. Mai întâi trebuie să activați localizarea, definind LANG (sau LC_ALL) la o altă valoare decât „C”, înainte de a putea utiliza o listă cu prioritate de limbă prin variabila LANGUAGE. Consultați și manualul «gettext»: L" #. type: textblock -#: dos2unix.pod:853 +#: dos2unix.pod:877 msgid "If you select a language which is not available you will get the standard English messages." msgstr "Dacă selectați o limbă care nu este disponibilă, veți primi mesajele standard în limba engleză." #. type: =item -#: dos2unix.pod:857 +#: dos2unix.pod:881 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:859 +#: dos2unix.pod:883 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C. Option B<--version> will display the LOCALEDIR that is used." msgstr "Cu variabila de mediu DOS2UNIX_LOCALEDIR, variabila LOCALEDIR definită în timpul compilării poate fi înlocuită. LOCALEDIR este folosită pentru a găsi fișierele de limbă. Valoarea implicită GNU este C. Opțiunea B<--version> va afișa valoarea pe care LOCALEDIR o utilizează." #. type: textblock -#: dos2unix.pod:864 +#: dos2unix.pod:888 msgid "Example (POSIX shell):" msgstr "Exemplu (shell POSIX):" #. type: verbatim -#: dos2unix.pod:866 +#: dos2unix.pod:890 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1732,39 +1785,39 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:871 +#: dos2unix.pod:895 msgid "RETURN VALUE" msgstr "VALOAREA RETURNATĂ" #. type: textblock -#: dos2unix.pod:873 +#: dos2unix.pod:897 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "La succes, se returnează zero. Când apare o eroare de sistem, va fi returnată ultima eroare de sistem. Pentru alte erori se returnează 1." #. type: textblock -#: dos2unix.pod:876 +#: dos2unix.pod:900 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "Valoarea returnată este întotdeauna zero în modul silențios, cu excepția cazului în care sunt utilizate opțiuni greșite ale liniei de comandă." #. type: =head1 -#: dos2unix.pod:879 +#: dos2unix.pod:903 msgid "STANDARDS" msgstr "STANDARDE" #. type: textblock -#: dos2unix.pod:881 -msgid "L" +#: dos2unix.pod:905 +msgid "L" msgstr "L" #. type: textblock -#: dos2unix.pod:883 -msgid "L" -msgstr "L" +#: dos2unix.pod:907 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:885 -msgid "L" -msgstr "L" +#: dos2unix.pod:909 +msgid "L" +msgstr "L" # R-GC, scrie: # după revizuirea fișierului, DȘ spune: @@ -1781,24 +1834,24 @@ msgstr "L" # → https://ro.wikipedia.org/wiki/Fi%C8%99ier_text # sper să apară bine după procesarea fișierului. #. type: textblock -#: dos2unix.pod:887 -msgid "L" +#: dos2unix.pod:911 +msgid "L" msgstr "L" #. type: =head1 -#: dos2unix.pod:889 +#: dos2unix.pod:913 msgid "AUTHORS" msgstr "AUTORI" #. type: textblock -#: dos2unix.pod:891 +#: dos2unix.pod:915 msgid "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer)" msgstr "Benjamin Lin - , Bernd Johannes Wuebben (modul mac2unix) - , Christian Wurll (adăugarea unei linii noi suplimentare) - , Erwin Waterlander - (menținător)" #. type: textblock -#: dos2unix.pod:896 -msgid "Project page: L" -msgstr "Pagina principală a proiectului: L" +#: dos2unix.pod:920 +msgid "Project page: L" +msgstr "Pagina principală a proiectului: L" # R-GC, scrie: # după revizuirea fișierului, DȘ zice: @@ -1809,16 +1862,25 @@ msgstr "Pagina principală a proiectului: L" -msgstr "Pagina SourceForge a proiectului: L" +#: dos2unix.pod:922 +msgid "SourceForge page: L" +msgstr "Pagina din SourceForge a proiectului: L" #. type: =head1 -#: dos2unix.pod:900 +#: dos2unix.pod:924 msgid "SEE ALSO" msgstr "CONSULTAȚI ȘI" #. type: textblock -#: dos2unix.pod:902 +#: dos2unix.pod:926 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" + +#~ msgid "Convert only line breaks. This is the default conversion mode." +#~ msgstr "Convertește numai întreruperile de linie. Acesta este modul de conversie implicit." + +#~ msgid "In mode C only line breaks are converted. This is the default conversion mode." +#~ msgstr "În modul C sunt convertite doar întreruperile de linie. Acesta este modul de conversie implicit." + +#~ msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." +#~ msgstr "Deși numele acestui mod este ASCII, care este un standard de 7 biți, modul actual este de 8 biți. Utilizați întotdeauna acest mod când convertiți fișiere Unicode UTF-8." diff --git a/dos2unix/po-man/sr.po b/dos2unix/po-man/sr.po index 9829753..56aaa4e 100644 --- a/dos2unix/po-man/sr.po +++ b/dos2unix/po-man/sr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix-man 7.5.0-beta5\n" -"POT-Creation-Date: 2023-04-23 10:34+0200\n" +"POT-Creation-Date: 2023-11-27 21:39+0100\n" "PO-Revision-Date: 2023-05-18 12:59+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" @@ -146,8 +146,10 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:121 -msgid "Convert only line breaks. This is the default conversion mode." -msgstr "Претвара само преламање реда. Ово је основни режим претварања." +#, fuzzy +#| msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES." +msgid "Default conversion mode. See also section CONVERSION MODES." +msgstr "Претварање између ДОС и ИСО-8859-1 скупа знакова. Видите такође одељак РЕЖИМИ ПРЕТВАРАЊА." #. type: =item #: dos2unix.pod:123 @@ -400,7 +402,7 @@ msgid "The following information is printed, in this order: number of DOS line b msgstr "Следеће информације се исписују, овим редом: број ДОС прелома реда, број Јуникс прелома реда, број Мек прелома реда, ознака редоследа бајтова, текст или бинарна, назив датотеке." #. type: textblock -#: dos2unix.pod:274 +#: dos2unix.pod:274 dos2unix.pod:290 msgid "Example output:" msgstr "Пример излаза:" @@ -435,116 +437,168 @@ msgstr "Знајте да понекад бинарна датотека мож #. type: textblock #: dos2unix.pod:287 +msgid "If in addition option C<-e> or C<--add-eol> is used also the type of the line break of the last line is printed, or C if there is none." +msgstr "" + +#. type: verbatim +#: dos2unix.pod:292 +#, fuzzy, no-wrap +#| msgid "" +#| " 6 0 0 no_bom text dos.txt\n" +#| " 0 6 0 no_bom text unix.txt\n" +#| " 0 0 6 no_bom text mac.txt\n" +#| " 6 6 6 no_bom text mixed.txt\n" +#| " 50 0 0 UTF-16LE text utf16le.txt\n" +#| " 0 50 0 no_bom text utf8unix.txt\n" +#| " 50 0 0 UTF-8 text utf8dos.txt\n" +#| " 2 418 219 no_bom binary dos2unix.exe\n" +#| "\n" +msgid "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" +msgstr "" +" 6 0 0 no_bom текст dos.txt\n" +" 0 6 0 no_bom текст unix.txt\n" +" 0 0 6 no_bom текст mac.txt\n" +" 6 6 6 no_bom текст mixed.txt\n" +" 50 0 0 UTF-16LE текст utf16le.txt\n" +" 0 50 0 no_bom текст utf8unix.txt\n" +" 50 0 0 UTF-8 текст utf8dos.txt\n" +" 2 418 219 no_bom бинарна dos2unix.exe\n" +"\n" + +#. type: textblock +#: dos2unix.pod:297 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Изборне додатне заставице се могу поставити да измене излаз. Могу се додати једна или више заставица." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:302 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:304 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "Исписује редове информација о датотеци за којима следи нулти знак уместо знака новог реда. Ово омогућава тачно тумачење назива датотека с размацима или наводницима када се користи заставица „c“. Користите ову заставицу у комбинацији са „xargs(1)“ опцијом „C<-0>“ или „C<--null>“." #. type: =item -#: dos2unix.pod:299 +#: dos2unix.pod:309 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:301 +#: dos2unix.pod:311 msgid "Print number of DOS line breaks." msgstr "Исписује број ДОС преламања реда." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:313 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:315 msgid "Print number of Unix line breaks." msgstr "Исписује број Јуникс преламања реда." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:317 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:319 msgid "Print number of Mac line breaks." msgstr "Исписује број Мек преламања реда." #. type: =item -#: dos2unix.pod:311 +#: dos2unix.pod:321 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:323 msgid "Print the byte order mark." msgstr "Исписује ознаку редоследа бајтова." #. type: =item -#: dos2unix.pod:315 +#: dos2unix.pod:325 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:317 +#: dos2unix.pod:327 msgid "Print if file is text or binary." msgstr "Исписује да ли је датотека текстуална или бинарна." #. type: =item -#: dos2unix.pod:319 +#: dos2unix.pod:329 +msgid "B" +msgstr "" + +#. type: textblock +#: dos2unix.pod:331 +#, fuzzy +#| msgid "Do not add a line break to the last line if there isn't one." +msgid "Print the type of the line break of the last line, or C if there is none." +msgstr "Не додаје прекид реда у последњи ред ако га нема." + +#. type: =item +#: dos2unix.pod:333 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:321 +#: dos2unix.pod:335 msgid "Print only the files that would be converted." msgstr "Исписује само датотеке које ће бити претворене." #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:337 msgid "With the C flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Са заставицом „C“ „dos2unix“ ће исписати само датотеке које садрже ДОС преламања реда, „unix2dos“ ће исписат само називе датотека које имају Јуникс преламања реда." +#. type: textblock +#: dos2unix.pod:340 +msgid "If in addition option C<-e> or C<--add-eol> is used also the files that lack a line break on the last line will be printed." +msgstr "" + #. type: =item -#: dos2unix.pod:326 +#: dos2unix.pod:343 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:345 msgid "Print a header." msgstr "Исписује заглавље." #. type: =item -#: dos2unix.pod:330 +#: dos2unix.pod:347 msgid "B

" msgstr "B

" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:349 msgid "Show file names without path." msgstr "Приказује називе датотека без путање." #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:353 msgid "Examples:" msgstr "Примери:" #. type: textblock -#: dos2unix.pod:338 +#: dos2unix.pod:355 msgid "Show information for all *.txt files:" msgstr "Приказује податке за све „*.txt“ датотеке:" #. type: verbatim -#: dos2unix.pod:340 +#: dos2unix.pod:357 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -554,12 +608,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:342 +#: dos2unix.pod:359 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Приказује само број ДОС преламања реда и број Јуникс преламања реда:" #. type: verbatim -#: dos2unix.pod:344 +#: dos2unix.pod:361 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -569,12 +623,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:346 +#: dos2unix.pod:363 msgid "Show only the byte order mark:" msgstr "Приказује само ознаку редоследа бајтова:" #. type: verbatim -#: dos2unix.pod:348 +#: dos2unix.pod:365 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -584,12 +638,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:350 +#: dos2unix.pod:367 msgid "List the files that have DOS line breaks:" msgstr "Исписује датотеке које имају ДОС преламање реда:" #. type: verbatim -#: dos2unix.pod:352 +#: dos2unix.pod:369 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -599,12 +653,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:354 +#: dos2unix.pod:371 msgid "List the files that have Unix line breaks:" msgstr "Исписује датотеке које имају Јуникс преламање реда:" #. type: verbatim -#: dos2unix.pod:356 +#: dos2unix.pod:373 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -614,12 +668,32 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:358 +#: dos2unix.pod:375 +#, fuzzy +#| msgid "List the files that have DOS line breaks:" +msgid "List the files that have DOS line breaks or lack a line break on the last line:" +msgstr "Исписује датотеке које имају ДОС преламање реда:" + +#. type: verbatim +#: dos2unix.pod:377 +#, fuzzy, no-wrap +#| msgid "" +#| " dos2unix -ic *.txt\n" +#| "\n" +msgid "" +" dos2unix -e -ic *.txt\n" +"\n" +msgstr "" +" dos2unix -ic *.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:379 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "Претвара само датотеке које имају ДОС преламање реда и оставља друге датотеке нетакнутим:" #. type: verbatim -#: dos2unix.pod:360 +#: dos2unix.pod:381 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -629,12 +703,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:362 +#: dos2unix.pod:383 msgid "Find text files that have DOS line breaks:" msgstr "Налази текстуалне датотеке које имају ДОС преламање реда:" #. type: verbatim -#: dos2unix.pod:364 +#: dos2unix.pod:385 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -644,122 +718,122 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:366 +#: dos2unix.pod:387 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:368 +#: dos2unix.pod:389 msgid "Keep the date stamp of output file same as input file." msgstr "Задржава печат датума излазне датотеке истим као код улазне." #. type: =item -#: dos2unix.pod:370 +#: dos2unix.pod:391 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:372 +#: dos2unix.pod:393 msgid "Display program's license." msgstr "Приказује лиценцу програма." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:395 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:397 msgid "Add additional newline." msgstr "Додаје додатни нови ред." #. type: textblock -#: dos2unix.pod:378 +#: dos2unix.pod:399 msgid "B: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B: Само ДОС преламања реда се мењају у два Јуникс преламања реда. У Мек режиму само Мек преламања реда се мењају у два Јуникс преламања реда." #. type: textblock -#: dos2unix.pod:382 +#: dos2unix.pod:403 msgid "B: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B: Само Јуникс преламања реда се мењају у два ДОС преламања реда. У Мек режиму Јуникс преламања реда се мењају у два Мек преламања реда." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:406 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:408 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "Пише Ознаку редоследа бајтова (BOM) у излазну датотеку. Подразумевано се записује УТФ-8 ОРБ." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:411 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "Када је улазна датотека УТФ-16, и користи се опција „C<-u>“, биће записана УТФ-16 ОРБ." #. type: textblock -#: dos2unix.pod:393 +#: dos2unix.pod:414 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "Никада не користите ову опцију када је излазно кодирање другачије од „UTF-8“, „UTF-16“, или „GB18030“. Видите такође одељак ЈУНИКОД." #. type: =item -#: dos2unix.pod:397 +#: dos2unix.pod:418 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile УЛАЗНА_ДАТОТЕКА ИЗЛАЗНА_ДАТОТЕКА ...>" #. type: textblock -#: dos2unix.pod:399 +#: dos2unix.pod:420 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I be used or you I lose your files." msgstr "Нови режим датотеке. Претвара датотеку УЛ_ДАТОТЕКА и пише излаз у датотеку ИЗЛ_ДАТОТЕКА. Називи датотека морају бити дати у паровима и називи џокера се „I<не>“ могу користити или „I<ћете>“ изгубити своје датотеке." #. type: textblock -#: dos2unix.pod:403 +#: dos2unix.pod:424 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "Особа која започне претварање у режиму нове (упарене) датотеке биће власник претворене датотеке. Овлашћења за читање/писање нове датотеке биће овлашћење изворне датотеке мање „umask(1)“ особе која покреће претварање." #. type: =item -#: dos2unix.pod:408 +#: dos2unix.pod:429 msgid "B<--no-allow-chown>" msgstr "B<--no-allow-chown>" #. type: textblock -#: dos2unix.pod:410 +#: dos2unix.pod:431 msgid "Don't allow file ownership change in old file mode (default)." msgstr "Не дозвољава да се власништва датотеке промене у режиму старе датотеке." #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:433 msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." msgstr "Прекида претварање када власништво корисника и/или групе изворне датотеке не може бити очувано у старом режиму датотеке. Такође видите опције „C<-o>“ и „C<-n>“. Ова опција је доступна само ако „dos2unix“ има подршку за очување власништва корисника и група над датотекама." #. type: =item -#: dos2unix.pod:417 +#: dos2unix.pod:438 msgid "B<--no-add-eol>" msgstr "B<--no-add-eol>" #. type: textblock -#: dos2unix.pod:419 +#: dos2unix.pod:440 msgid "Do not add a line break to the last line if there isn't one." msgstr "Не додаје прекид реда у последњи ред ако га нема." #. type: =item -#: dos2unix.pod:421 +#: dos2unix.pod:442 msgid "B<-O, --to-stdout>" msgstr "B<-O, --to-stdout>" #. type: textblock -#: dos2unix.pod:423 +#: dos2unix.pod:444 msgid "Write to standard output, like a Unix filter. Use option C<-o> to go back to old file (in-place) mode." msgstr "Пише на стандардни излаз, као Јуникс филтер. Користите опцију „-o“ да се вратите на режим старе датотеке (одмах)." #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:447 msgid "Combined with option C<-e> files can be properly concatenated. No merged last and first lines, and no Unicode byte order marks in the middle of the concatenated file. Example:" msgstr "Заједно са опцијом „-e“ датотеке се могу исправно надовезати. Нема стопљеног првог и последњег реда, и нема ознаке поретка Јуникод бајта по средини надовезане датотеке. Пример:" #. type: verbatim -#: dos2unix.pod:430 +#: dos2unix.pod:451 #, no-wrap msgid "" " dos2unix -e -O file1.txt file2.txt > output.txt\n" @@ -769,32 +843,32 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:432 +#: dos2unix.pod:453 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile ДАТОТЕКА ...>" #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:455 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "Режим старе датотеке. Претвара датотеку ДАТОТЕКА и преписује излаз у њу. Програм подразумевано ради у овом режиму. Џокери назива се могу користити." #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:458 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "У режиму старе датотеке (у месту) претворена датотека добија иста овлашћења власника, групе и читања/писања као и изворна датотека. Такође када датотеку претвори други корисник који има овлашћење писања над датотеком (нпр. корисник администратор). Претварање ће се прекинути када не буде било могуће очувати изворне вредности. Промена власника може значити да првобитни власник више не може да чита датотеку. Промена групе може представљати безбедносни ризик, датотека може постати читљива од стране особа којима није намењена. Очување овлашћења власника, групе и читања/писања подржано је само на Јуниксу." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:467 msgid "To check if dos2unix has support for preserving the user and group ownership of files type C." msgstr "Да проверите да ли „dos2unix“ има подршку очувања власништва корисника и групе над датотеком упишите „C“." #. type: textblock -#: dos2unix.pod:449 +#: dos2unix.pod:470 msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" msgstr "Претварање се увек врши путем привремене датотеке. Када се на пола претварања догоди грешка, привремена датотека се брише а изворна датотека остаје нетакнута. Када претварање успе, изворна датотека се замењује привременом датотеком. Можете имати дозволу за писање над изворном датотеком, али немате дозволу да ставите иста својстава овлашћења корисника и/или груп у привремену датотеку као што има и изворна датотека. То значи да нисте у могућности да сачувате власништво корисника и/или групе над изворном датотеком. У овом случају можете користити опцију „C<--allow-chown>“ да наставите са претварањем:" #. type: verbatim -#: dos2unix.pod:458 +#: dos2unix.pod:479 #, no-wrap msgid "" " dos2unix --allow-chown foo.txt\n" @@ -804,12 +878,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:460 +#: dos2unix.pod:481 msgid "Another option is to use new file mode:" msgstr "Друга могућност је да користи режим нове датотеке:" #. type: verbatim -#: dos2unix.pod:462 +#: dos2unix.pod:483 #, no-wrap msgid "" " dos2unix -n foo.txt foo.txt\n" @@ -819,227 +893,229 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:485 msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." msgstr "Предност опције „C<--allow-chown>“ је да можете користити џокере, а својства власништва биће очувана када је могуће." #. type: =item -#: dos2unix.pod:467 +#: dos2unix.pod:488 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:469 +#: dos2unix.pod:490 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Тихи режим. Потискује сва упозорења и поруке. Резултантна вредност је нула. Осим када се користе погрешне опције линије наредби." #. type: =item -#: dos2unix.pod:472 +#: dos2unix.pod:493 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:495 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "Уклања Ознаку редоследа бајтова (BOM). Не пише ОРБ у излазну датотеку. Ово је основно понашање приликом претварања у Јуникс преламање реда. Видите такође опцију „C<-b>“." #. type: =item -#: dos2unix.pod:478 +#: dos2unix.pod:499 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:501 msgid "Skip binary files (default)." msgstr "Прескаче извршне датотеке (основно)." #. type: textblock -#: dos2unix.pod:482 +#: dos2unix.pod:503 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "Прескакање бинарних датотека врши се како би се избегле случајне грешке. Имајте на уму да откривање бинарних датотека није 100% поуздано. У улазним датотекама се траже бинарни симболи који се обично не налазе у текстуалним датотекама. Могуће је да бинарна датотека садржи само обичне текстуалне знакове. Таква бинарна датотека ће се погрешно сматрати текстуалном датотеком." #. type: =item -#: dos2unix.pod:488 +#: dos2unix.pod:509 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:490 +#: dos2unix.pod:511 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "Задржава изворно УТФ-16 кодирање улазне датотеке. Излазна датотека биће записана у истом УТФ-16 кодирању, малом или великом крајношћу, као и улазна датотека. Ово спречава преображај у УТФ-8. УТФ-16 ОРБ биће записан у складу с тим. Ова опција се може онемогућити помоћу опције „C<-ascii>“." #. type: =item -#: dos2unix.pod:495 +#: dos2unix.pod:516 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:497 +#: dos2unix.pod:518 msgid "Assume that the input file format is UTF-16LE." msgstr "Подразумева да је формат улазне датотеке „UTF-16LE“." #. type: textblock -#: dos2unix.pod:499 +#: dos2unix.pod:520 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "Када постоји Ознака редоследа бајтова у улазној датотеци ОРБ има предност над овом опцијом." #. type: textblock -#: dos2unix.pod:502 +#: dos2unix.pod:523 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "Када сте погрешно претпоставили (улазна датотека није била у УТФ-16ЛЕ формату) а претварање је успело, добићете УТФ-8 излазну датотеку са погрешним текстом. Погрешно претварање можете да опозовете помоћу „iconv(1)“ претварањем УТФ-8 излазне датотеке назад у УТФ-16ЛЕ. Ово ће вратити изворну датотеку." #. type: textblock -#: dos2unix.pod:507 +#: dos2unix.pod:528 msgid "The assumption of UTF-16LE works as a I. By switching to the default I mode the UTF-16LE assumption is turned off." msgstr "Претпоставка УТФ-16ЛЕ ради као „I“. Пребацивањем на основни „I“ режим УТФ-16ЛЕ претпоставка се искључује." #. type: =item -#: dos2unix.pod:510 +#: dos2unix.pod:531 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:512 +#: dos2unix.pod:533 msgid "Assume that the input file format is UTF-16BE." msgstr "Подразумева да је формат улазне датотеке „UTF-16BE“." #. type: textblock -#: dos2unix.pod:514 +#: dos2unix.pod:535 msgid "This option works the same as option C<-ul>." msgstr "Ова опција ради исто као и опција „C<-ul>“." #. type: =item -#: dos2unix.pod:516 +#: dos2unix.pod:537 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:518 +#: dos2unix.pod:539 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "Приказује опширне поруке. Додатне информације се приказују о Ознаци редоследа бајтова и количини претворених преламања реда." #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:542 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:523 +#: dos2unix.pod:544 msgid "Follow symbolic links and convert the targets." msgstr "Прати симболичке везе и претвара циљеве." #. type: =item -#: dos2unix.pod:525 +#: dos2unix.pod:546 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:527 +#: dos2unix.pod:548 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "Замењује симболичке везе претвореним датотекама (изворне циљне датотеке остају непромењене)." #. type: =item -#: dos2unix.pod:530 +#: dos2unix.pod:551 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:532 +#: dos2unix.pod:553 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Задржава неизмењеним симболичке везе и циљеве (основно)." #. type: =item -#: dos2unix.pod:534 +#: dos2unix.pod:555 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:536 +#: dos2unix.pod:557 msgid "Display version information and exit." msgstr "Приказује податке о издању и излази." #. type: =head1 -#: dos2unix.pod:540 +#: dos2unix.pod:561 msgid "MAC MODE" msgstr "МЕК РЕЖИМ" #. type: textblock -#: dos2unix.pod:542 -msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." +#: dos2unix.pod:563 +#, fuzzy +#| msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." +msgid "By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." msgstr "У нормалном режиму преламања реда се претварју из ДОС-а у Јуникс и обратно. Мек преламања реда се не претварају." #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:566 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "У Мек режиму преламања реда се претварју из Мек-а у Јуникс и обратно. ДОС преламања реда се не мењају." #. type: textblock -#: dos2unix.pod:548 +#: dos2unix.pod:569 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C or C." msgstr "Да покренете у Мек режиму користите опцију „C<-c mac>“ или користите наредбе „C“ или „C“." #. type: =head1 -#: dos2unix.pod:551 +#: dos2unix.pod:572 msgid "CONVERSION MODES" msgstr "РЕЖИМИ ПРЕТВАРАЊА" #. type: =item -#: dos2unix.pod:555 +#: dos2unix.pod:576 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:557 -msgid "In mode C only line breaks are converted. This is the default conversion mode." -msgstr "У „C“ режиму само преламања реда се претварају. Ово је основни режим претварања." +#: dos2unix.pod:578 +msgid "This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling B mode disables B<7bit> and B mode." +msgstr "" #. type: textblock -#: dos2unix.pod:560 -msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." -msgstr "Иако је назив овог режима АСКРИ, што је 7-битни стандард, стварни режим је 8-битни. Увек користите овај режим приликом претварања Јуникод УТФ-8 датотека." +#: dos2unix.pod:582 +msgid "If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has UTF-16 support type C. See also section UNICODE." +msgstr "" #. type: =item -#: dos2unix.pod:564 +#: dos2unix.pod:588 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:566 +#: dos2unix.pod:590 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "У овом режиму сви 8 битни не-АСКРИ знаци (са вредностима од 128 до 255) се претварају у 7 битне размаке." #. type: =item -#: dos2unix.pod:569 +#: dos2unix.pod:593 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:571 +#: dos2unix.pod:595 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Знакови се претварају између ДОС скупа знакова (кодна страница) и ИСО скупа знакова ИСО-8859-1 (Latin-1) на Јуниксу. ДОС знакови без ИСО-8859-1 еквивалента, за које претварање није могуће, претварају се у тачку. Исто се рачуна и за ИСО-8859-1 знакове без ДОС-а." #. type: textblock -#: dos2unix.pod:576 +#: dos2unix.pod:600 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "Када се користи само опција „C<-iso>“, „dos2unix“ ће покушати да одреди активну кодну страницу. Када то није могуће, „dos2unix“ ће користити подразумевану кодну страницу ЦП437, која се углавном користи у САД-у. Да бисте приморали одређену кодну страницу, користите опције „C<-437>“ (САД), „C<-850>“ (западноевропски), „C<-860>“ (португалски), „C<-863>“ (француски канадски) или „C<-865>“ (нордијски). Виндоуз кодна страница ЦП1252 (западноевропски) је такође подржана опцијом „C<-1252>“. За остале кодне странице користите „dos2unix“ у комбинацији са „iconv(1)“. Иконв може да претвара између дугог списка кодирања знакова." #. type: textblock -#: dos2unix.pod:585 +#: dos2unix.pod:609 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "Никада не користите ИСО претварање над Јуникод текстуалним датотекама. Оштетиће УТФ-8 кодиране датотеке." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:611 msgid "Some examples:" msgstr "Неки примери:" #. type: textblock -#: dos2unix.pod:589 +#: dos2unix.pod:613 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Претворите из ДОС основне кодне странице у Јуникс Latin-1:" #. type: verbatim -#: dos2unix.pod:591 +#: dos2unix.pod:615 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -1049,12 +1125,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:593 +#: dos2unix.pod:617 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Претворите из ДОС CP850 у Јуникс Latin-1:" #. type: verbatim -#: dos2unix.pod:595 +#: dos2unix.pod:619 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -1064,12 +1140,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:597 +#: dos2unix.pod:621 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Претворите из Виндоуз CP1252 у Јуникс Latin-1:" #. type: verbatim -#: dos2unix.pod:599 +#: dos2unix.pod:623 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -1079,12 +1155,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:601 +#: dos2unix.pod:625 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Претворите из Виндоуз CP1252 у Јуникс УТФ-8 (Јуникод):" #. type: verbatim -#: dos2unix.pod:603 +#: dos2unix.pod:627 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -1094,12 +1170,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:605 +#: dos2unix.pod:629 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Претворите из Јуникс Latin-1 у ДОС основну кодну страницу:" #. type: verbatim -#: dos2unix.pod:607 +#: dos2unix.pod:631 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -1109,12 +1185,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:609 +#: dos2unix.pod:633 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Претворите из Јуникс Latin-1 у ДОС CP850:" #. type: verbatim -#: dos2unix.pod:611 +#: dos2unix.pod:635 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1124,12 +1200,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:637 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Претворите из Јуникс Latin-1 у Вондоуз CP1252:" #. type: verbatim -#: dos2unix.pod:615 +#: dos2unix.pod:639 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1139,12 +1215,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:617 +#: dos2unix.pod:641 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Претворите из Јуникс УТФ-8 (Јуникод) у Вондоуз CP1252:" #. type: verbatim -#: dos2unix.pod:619 +#: dos2unix.pod:643 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1154,142 +1230,146 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:621 +#: dos2unix.pod:645 msgid "See also L and L." msgstr "Видите такође L и L." #. type: =head1 -#: dos2unix.pod:626 +#: dos2unix.pod:650 msgid "UNICODE" msgstr "УНИКОД" #. type: =head2 -#: dos2unix.pod:628 +#: dos2unix.pod:652 msgid "Encodings" msgstr "Кодирања" #. type: textblock -#: dos2unix.pod:630 +#: dos2unix.pod:654 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Постоје различита Јуникод кодирања. На Јуниксу и Линуксу Јуникод датотеке су обично кодиране у УТФ-8 кодирању. На Виндоузу Јуникод текстуалне датотеке могу бити кодиране у УТФ-8, УТФ-16 или УТФ-16 великој крајности, али су углавном кодиране у УТФ-16 формату." #. type: =head2 -#: dos2unix.pod:635 +#: dos2unix.pod:659 msgid "Conversion" msgstr "Претварање" #. type: textblock -#: dos2unix.pod:637 -msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." +#: dos2unix.pod:661 +#, fuzzy +#| msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." +msgid "Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files." msgstr "Јуникод текстуалне датотеке могу имати ДОС, Јуникс или мек преломе реда, као обичне текстуалне датотеке." #. type: textblock -#: dos2unix.pod:640 +#: dos2unix.pod:664 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Сва издања „dos2unix“-а и „unix2do“-а могу претворити УТФ-8 кодиране датотеке, јер је УТФ-8 дизајниран за повратну сагласност са АСКРИ-ијем." #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:667 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C." msgstr "„dos2unix“ и „unix2dos“ са Јуникод УТФ-16 подршком, може читати УТФ-16 кодиране текстуалне датотеке мале и велике крајности. Да видите да ли је „dos2unix“ изграђен са УТФ-16 подршком упишите „C“." #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:671 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "На Јуниксу/Линуксу УТФ-16 кодиране датотеке се претварају у локално кодирање знакова. Користите наредбу „locale(1)“ да сазнате које је кодирање знакова локализације. Када претварање није могуће, десиће се грешка претварања а датотека ће бити прескочена." #. type: textblock -#: dos2unix.pod:652 +#: dos2unix.pod:676 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "На Виндоузу УТФ-16 датотеке се подразумевано претварају у УТФ-8. УТФ-8 форматиране текстуалне датотеке су добро подржане и на Виндоузу и на Јуникс/Линуксу." #. type: textblock -#: dos2unix.pod:655 +#: dos2unix.pod:679 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "УТФ-16 и УТФ-8 кодирања су у потпуности сагласна, у претварању се неће изгубити никакав текст. Када се догоди грешка претварања УТФ-16 у УТФ-8, на пример када улазна УТФ-16 датотека садржи грешку, датотека ће бити прескочена." #. type: textblock -#: dos2unix.pod:659 +#: dos2unix.pod:683 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "Када се користи опција „C<-u>“, излазна датотека ће бити записана у истом УТФ-16 кодирању као и улазна датотека. Опција „C<-u>“ спречава претварање у УТФ-8." #. type: textblock -#: dos2unix.pod:662 +#: dos2unix.pod:686 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "„dos2unix“ и „unix2dos“ немају могућности да претворе УТФ-8 датотеке у УТФ-16." #. type: textblock -#: dos2unix.pod:664 +#: dos2unix.pod:688 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "ИСО и 7-битни режим претварања не ради на УТФ-16 датотекама." #. type: =head2 -#: dos2unix.pod:666 +#: dos2unix.pod:690 msgid "Byte Order Mark" msgstr "Ознака редоследа бајтова" #. type: textblock -#: dos2unix.pod:668 -msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." +#: dos2unix.pod:692 +#, fuzzy +#| msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." +msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." msgstr "На Виндоузу Јуникод текстуалне датотеке обично имају Ознаку редоследа бајтова (BOM), јер многи Виндоуз програми (укључујући Бележницу) подразумевано додају ОРБ. Видите такође L." #. type: textblock -#: dos2unix.pod:672 +#: dos2unix.pod:696 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "На Јуниксу Јуникод датотеке обично немају ОРБ. Претпоставља се да су текстуалне датотеке кодиране у језичком кодирању знака." #. type: textblock -#: dos2unix.pod:675 +#: dos2unix.pod:699 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "„dos2unix“ може открити само да ли је датотека у УТФ-16 формату и да ли датотека има ОРБ. Када УТФ-16 датотека нема ОРБ, „dos2unix“ ће видети датотеку као бинарну." #. type: textblock -#: dos2unix.pod:679 +#: dos2unix.pod:703 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Користите опцију „C<-ul>“ или „C<-ub>“ да претворите УТФ-16 датотеку без ОРБ-а." #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:705 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "„dos2unix“ подразумевано не записује ОРБ у излазну датотеку. Са опцијом „C<-b>“ „dos2unix записује ОРБ када улазна датотека има ОРБ." #. type: textblock -#: dos2unix.pod:684 +#: dos2unix.pod:708 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "„unix2dos“ подразумевано записује ОРБ у излазну датотеку када улазна датотека има ОРБ. Користите опцију „C<-r>“ да уклоните ОРБ." #. type: textblock -#: dos2unix.pod:687 +#: dos2unix.pod:711 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "„dos2unix“ и „unix2dos“ увек записује ОРБ када се користи „C<-m>“ опција." #. type: =head2 -#: dos2unix.pod:689 +#: dos2unix.pod:713 msgid "Unicode file names on Windows" msgstr "Јуникод називи датотека на Виндоузу" #. type: textblock -#: dos2unix.pod:691 +#: dos2unix.pod:715 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C." msgstr "„dos2unix“ има изборну подршку за читање и писање Јуникод назива датотека у Виндоуз командној линији. То значи да „dos2unix“ може отворити датотеке које у називу имају знакове који нису део подразумеване системске АНСИ кодне странице. Да бисте видели да ли је „dos2unix“ за Виндоуз изграђен са подршком Јуникод назива датотеке упишите „C“." #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:721 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "Постоје проблеми са приказом Јуникод назива датотека у Виндоуз конзоли. Видите опцију „C<-D>“, „C<--display-enc>“. Називи датотека могу бити погрешно приказани у конзоли, али ће датотеке бити записане под тачним називом." #. type: =head2 -#: dos2unix.pod:701 +#: dos2unix.pod:725 msgid "Unicode examples" msgstr "Примери Уникода" #. type: textblock -#: dos2unix.pod:703 +#: dos2unix.pod:727 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Претвара из Виндоуз УТФ-16 (са ОРБ-ом) у Јуникс УТФ-8:" #. type: verbatim -#: dos2unix.pod:705 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1299,12 +1379,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:731 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Претвара из Виндоуз УТФ-16ЛЕ (без ОРБ-а) у Јуникс УТФ-8:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:733 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1314,12 +1394,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:735 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Претворите из Јуникс УТФ-8 у Вондоуз УТФ-8 са ОРБ-ом:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:737 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1329,12 +1409,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:739 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Претворите из Јуникс УТФ-8 у Вондоуз УТФ-16:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:741 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1344,47 +1424,49 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:719 +#: dos2unix.pod:743 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:721 -msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." +#: dos2unix.pod:745 +#, fuzzy +#| msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." +msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." msgstr "„GB18030“ је стандард кинеске владе. Обавезни подскуп „GB18030“ стандард се званично захтева за све софтверске производе продате у Кини. Видите такође L." #. type: textblock -#: dos2unix.pod:725 +#: dos2unix.pod:749 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "„GB18030“ је у потпуности сагласан са Јуникод-ом, и може се сматрати Јуникод форматом преображаја. Као УТФ-8, „GB18030“ је сагласан са АСКРИ. „GB18030“ је такође сагласан са Виндоуз кодном страницом 936, познатом и као ГБК." #. type: textblock -#: dos2unix.pod:729 +#: dos2unix.pod:753 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C to get the list of supported locales." msgstr "На Јуниксу/Линуксу УТФ-16 датотеке се претварају у „GB18030“ када је језичко кодирање постављено на „GB18030“. Знајте да ће ово радити само ако је језик подржан системом. Користите наредбу „C“ да добавите списак подржаних језика." #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:757 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "На Виндоузу треба да користите опцију „C<-gb>“ да преведете УТФ-16 датотеке у „GB18030“." #. type: textblock -#: dos2unix.pod:735 +#: dos2unix.pod:759 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "„GB18030“ кодиране датотеке могу имати Ознаку редоследа бајтова, као Јуникод датотеке." #. type: =head1 -#: dos2unix.pod:737 +#: dos2unix.pod:761 msgid "EXAMPLES" msgstr "ПРИМЕРИ" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:763 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Чита улаз са „стнд_улаза“ и пише излаз на „стнд_излаз“:" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:765 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1396,12 +1478,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:744 +#: dos2unix.pod:768 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "Претвара и замењује „а.txt“. Претвара и замењује „б.txt“:" #. type: verbatim -#: dos2unix.pod:746 +#: dos2unix.pod:770 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1413,12 +1495,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:749 +#: dos2unix.pod:773 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "Претвара и замењује „а.txt“ у аскри режиму претварања:" #. type: verbatim -#: dos2unix.pod:751 +#: dos2unix.pod:775 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1428,12 +1510,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:753 +#: dos2unix.pod:777 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "Претвара и замењује „а.txt“ у аскри режиму претварања, Претвара и замењује „б.txt“ у 7битном режиму претварања:" #. type: verbatim -#: dos2unix.pod:756 +#: dos2unix.pod:780 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1447,12 +1529,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:760 +#: dos2unix.pod:784 msgid "Convert a.txt from Mac to Unix format:" msgstr "Претвара „а.txt“ из Мек у Јуникс формат:" #. type: verbatim -#: dos2unix.pod:762 +#: dos2unix.pod:786 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1464,12 +1546,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:765 +#: dos2unix.pod:789 msgid "Convert a.txt from Unix to Mac format:" msgstr "Претвара „а.txt“ из Јуникс у Мек формат:" #. type: verbatim -#: dos2unix.pod:767 +#: dos2unix.pod:791 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1481,12 +1563,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:770 +#: dos2unix.pod:794 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "Претвара и замењује „а.txt“ док задржава изворни печат датума:" #. type: verbatim -#: dos2unix.pod:772 +#: dos2unix.pod:796 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1498,12 +1580,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:775 +#: dos2unix.pod:799 msgid "Convert a.txt and write to e.txt:" msgstr "Претвара „а.txt“ и пише на „е.txt“:" #. type: verbatim -#: dos2unix.pod:777 +#: dos2unix.pod:801 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1513,12 +1595,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:779 +#: dos2unix.pod:803 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "Претвара „а.txt“ и пише на „е.txt“, задржава печат датума „е.txt“-а истим као „а.txt“:" #. type: verbatim -#: dos2unix.pod:781 +#: dos2unix.pod:805 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1528,12 +1610,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:783 +#: dos2unix.pod:807 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "Претвара и замењује „а.txt“, претвара „б.txt“ и пише на „.txt“:" #. type: verbatim -#: dos2unix.pod:785 +#: dos2unix.pod:809 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1545,12 +1627,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:788 +#: dos2unix.pod:812 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "Претвара „ц.txt“ и пише на „е.txt“, претвара и замењује„а.txt“, претвара и замењује „б.txt“, претвара „д.txt“ и пише у „ф.txt“:" #. type: verbatim -#: dos2unix.pod:791 +#: dos2unix.pod:815 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1560,17 +1642,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:793 +#: dos2unix.pod:817 msgid "RECURSIVE CONVERSION" msgstr "ДУБИНСКО ПРЕТВАРАЊЕ" #. type: textblock -#: dos2unix.pod:795 +#: dos2unix.pod:819 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "У Јуникс шкољци наредбе „find(1)“ и „xargs(1)“ се могу користити за покретање „dos2unix“-а дубински преко свих текстуалних датотека у стаблу директоријума. На пример за претварање свих „.txt“ датотека у стаблу директоријума под текућим директоријумом упишите:" #. type: verbatim -#: dos2unix.pod:799 +#: dos2unix.pod:823 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1580,12 +1662,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:801 +#: dos2unix.pod:825 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "„find(1)“-ова опција „C<-print0>“ и одговарајућа „xargs(1)“-ова опција „C<-0>“ су потребне када постоје датотеке са размацима и наводницима у називима. У супротном се ове опције могу изоставити. Друга могућност је да користите „find(1)“ са „C<-exec>“ опцијом:" #. type: verbatim -#: dos2unix.pod:805 +#: dos2unix.pod:829 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1595,12 +1677,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:807 +#: dos2unix.pod:831 msgid "In a Windows Command Prompt the following command can be used:" msgstr "У Виндоуз командном упиту следеће наредбе се могу користити:" #. type: verbatim -#: dos2unix.pod:809 +#: dos2unix.pod:833 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1610,12 +1692,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:811 +#: dos2unix.pod:835 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "Корисници „PowerShell“-а могу користити следеће наредбе у Виндоуз „PowerShell“-у:" #. type: verbatim -#: dos2unix.pod:813 +#: dos2unix.pod:837 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1625,22 +1707,22 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:816 +#: dos2unix.pod:840 msgid "LOCALIZATION" msgstr "ЈЕЗИЧЕЊЕ" #. type: =item -#: dos2unix.pod:820 +#: dos2unix.pod:844 msgid "B" msgstr "B<ЈЕЗ>" #. type: textblock -#: dos2unix.pod:822 +#: dos2unix.pod:846 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "Примарни језик се бира променљивом окружења „LANG“. Променљива „LANG“ се састоји из неколико делова. Први део је малим словима језички код. Други је необавезан и представља код државе великим словима, којем претходи доња црта. Ту је и изборни трећи део: кодирање знакова, којем претходи тачка. Неколико примера за врсте шкољки ПОСИКС стандарда:" #. type: verbatim -#: dos2unix.pod:829 +#: dos2unix.pod:853 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1662,47 +1744,51 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:837 -msgid "For a complete list of language and country codes see the gettext manual: L" +#: dos2unix.pod:861 +#, fuzzy +#| msgid "For a complete list of language and country codes see the gettext manual: L" +msgid "For a complete list of language and country codes see the gettext manual: L" msgstr "За потпун списак језика и шифара држава видите приручник геттекста: L" #. type: textblock -#: dos2unix.pod:840 +#: dos2unix.pod:864 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "На Јуникс системима можете користити наредбу „locale(1)“ да видите особене податке језика." #. type: =item -#: dos2unix.pod:843 +#: dos2unix.pod:867 msgid "B" msgstr "B<ЈЕЗИК>" #. type: textblock -#: dos2unix.pod:845 -msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" +#: dos2unix.pod:869 +#, fuzzy +#| msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" +msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" msgstr "Са променљивом окружења ЈЕЗИК можете навести списак хитности језика. „dos2unix“ даје предност за ЈЕЗИК над ЈЕЗ. На пример, прво холандски а затим немачки: C. Прво треба да омогућите преводе, постављајући „LANG“ (или LC_ALL) на вредност другаачију од „C“, пре него ли будете могли да користите списак хитности језика променљивом „LANGUAGE“. Видите такође приручник геттекста: L" #. type: textblock -#: dos2unix.pod:853 +#: dos2unix.pod:877 msgid "If you select a language which is not available you will get the standard English messages." msgstr "Ако изаберете језик који није доступан добићете стандардне поруке на енглеском." #. type: =item -#: dos2unix.pod:857 +#: dos2unix.pod:881 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:859 +#: dos2unix.pod:883 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C. Option B<--version> will display the LOCALEDIR that is used." msgstr "Са променљивом окружења „DOS2UNIX_LOCALEDIR“ „LOCALEDIR“ поставка у време компилације се може поништити. „LOCALEDIR“ се користи за налажење датотека језика. ГНУ-ова основна вредност је „C“. Опција „B<--version>“ ће приказати „LOCALEDIR“ који се користи." #. type: textblock -#: dos2unix.pod:864 +#: dos2unix.pod:888 msgid "Example (POSIX shell):" msgstr "Пример (ПОСИКС љуска):" #. type: verbatim -#: dos2unix.pod:866 +#: dos2unix.pod:890 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1712,71 +1798,94 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:871 +#: dos2unix.pod:895 msgid "RETURN VALUE" msgstr "РЕЗУЛТНА ВРЕДНОСТ" #. type: textblock -#: dos2unix.pod:873 +#: dos2unix.pod:897 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "На успех, резултат је нула. Када има системских грешака резултат је последња грешка система. За друге грешке резултат је 1." #. type: textblock -#: dos2unix.pod:876 +#: dos2unix.pod:900 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "Вредност резултата је увек нула у тихом режиму, изузев када се користе погрешне опције линије наредби." #. type: =head1 -#: dos2unix.pod:879 +#: dos2unix.pod:903 msgid "STANDARDS" msgstr "СТАНДАРДИ" #. type: textblock -#: dos2unix.pod:881 -msgid "L" +#: dos2unix.pod:905 +#, fuzzy +#| msgid "L" +msgid "L" msgstr "L" #. type: textblock -#: dos2unix.pod:883 -msgid "L" +#: dos2unix.pod:907 +#, fuzzy +#| msgid "L" +msgid "L" msgstr "L" #. type: textblock -#: dos2unix.pod:885 -msgid "L" +#: dos2unix.pod:909 +#, fuzzy +#| msgid "L" +msgid "L" msgstr "L" #. type: textblock -#: dos2unix.pod:887 -msgid "L" +#: dos2unix.pod:911 +#, fuzzy +#| msgid "L" +msgid "L" msgstr "L" #. type: =head1 -#: dos2unix.pod:889 +#: dos2unix.pod:913 msgid "AUTHORS" msgstr "АУТОРИ" #. type: textblock -#: dos2unix.pod:891 +#: dos2unix.pod:915 msgid "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer)" msgstr "Бенџамин Лин – , Бернд Јоханес Вебен (mac2unix) – , Кристијан Вирл (додаје додатни нови ред) – , Ервин Вотерландер – (одржавалац)" #. type: textblock -#: dos2unix.pod:896 -msgid "Project page: L" +#: dos2unix.pod:920 +#, fuzzy +#| msgid "Project page: L" +msgid "Project page: L" msgstr "Страница пројекта: L" #. type: textblock -#: dos2unix.pod:898 -msgid "SourceForge page: L" +#: dos2unix.pod:922 +#, fuzzy +#| msgid "SourceForge page: L" +msgid "SourceForge page: L" msgstr "Страница Ковнице извора: L" #. type: =head1 -#: dos2unix.pod:900 +#: dos2unix.pod:924 msgid "SEE ALSO" msgstr "ВИДИТЕ ТАКОЂЕ" #. type: textblock -#: dos2unix.pod:902 +#: dos2unix.pod:926 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" + +#, fuzzy +#~| msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." +#~ msgid "Although the name of this mode is B, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." +#~ msgstr "Иако је назив овог режима АСКРИ, што је 7-битни стандард, стварни режим је 8-битни. Увек користите овај режим приликом претварања Јуникод УТФ-8 датотека." + +#~ msgid "Convert only line breaks. This is the default conversion mode." +#~ msgstr "Претвара само преламање реда. Ово је основни режим претварања." + +#~ msgid "In mode C only line breaks are converted. This is the default conversion mode." +#~ msgstr "У „C“ режиму само преламања реда се претварају. Ово је основни режим претварања." diff --git a/dos2unix/po-man/sv.po b/dos2unix/po-man/sv.po index b173fb4..60cb315 100644 --- a/dos2unix/po-man/sv.po +++ b/dos2unix/po-man/sv.po @@ -1,13 +1,13 @@ # Swedish translation for dos2unix-man. -# Copyright © 2014, 2015, 2016, 2017, 2022, 2023 Erwin Waterlander (msgids) +# Copyright © 2014, 2015, 2016, 2017, 2022, 2023, 2024 Erwin Waterlander (msgids) # This file is distributed under the same license as the dos2unix package. -# Sebastian Rasmussen , 2014, 2015, 2016, 2017, 2022, 2023. +# Sebastian Rasmussen , 2014, 2015, 2016, 2017, 2022, 2023, 2024. # msgid "" msgstr "" -"Project-Id-Version: dos2unix-man 7.5.0-beta5\n" -"POT-Creation-Date: 2023-04-23 10:34+0200\n" -"PO-Revision-Date: 2023-04-26 17:20+0200\n" +"Project-Id-Version: dos2unix-man 7.5.2-beta3\n" +"POT-Creation-Date: 2023-11-27 22:01+0100\n" +"PO-Revision-Date: 2024-01-17 12:42+0100\n" "Last-Translator: Sebastian Rasmussen \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 3.2.2\n" +"X-Generator: Poedit 3.4.2\n" #. type: =head1 #: dos2unix.pod:52 @@ -146,8 +146,8 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:121 -msgid "Convert only line breaks. This is the default conversion mode." -msgstr "Konvertera enbart radbrytningar. Detta är standardkonverteringsläget." +msgid "Default conversion mode. See also section CONVERSION MODES." +msgstr "Standardkonverteringsläge. Se vidare stycket KONVERTERINGSLÄGEN." #. type: =item #: dos2unix.pod:123 @@ -400,7 +400,7 @@ msgid "The following information is printed, in this order: number of DOS line b msgstr "Följande information skrivs ut, i denna ordningen: antal DOS-radbrytningar, antal Unix-radbrytningar, antal Mac-radbrytningar, byteordningsmarkeringen, text eller binär, filnamn." #. type: textblock -#: dos2unix.pod:274 +#: dos2unix.pod:274 dos2unix.pod:290 msgid "Example output:" msgstr "Exempelutmatning:" @@ -435,116 +435,152 @@ msgstr "Notera att en binärfil ibland kan misstas för en textfil. Se vidare fl #. type: textblock #: dos2unix.pod:287 +msgid "If in addition option C<-e> or C<--add-eol> is used also the type of the line break of the last line is printed, or C if there is none." +msgstr "Om dessutom flaggan C<-e> eller C<--add-eol> används så kommer även den radbrytning som används på sista raden att skrivas ut, eller C om det inte finns någon." + +#. type: verbatim +#: dos2unix.pod:292 +#, no-wrap +msgid "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" +msgstr "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:297 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Extra flaggor kan användas valfritt för att ändra utmatningen. En eller fler flaggor kan läggas till." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:302 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:304 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "Skriv ut filinformationsraderna följt av ett null-tecken istället för ett nyradstecken. Detta möjliggör korrekt tolkning av filnamn med blanksteg eller citationstecken när c-flaggan används. Använd denna flagga i kombination med xargs(1):s flagga C<-0> eller C<--null>." #. type: =item -#: dos2unix.pod:299 +#: dos2unix.pod:309 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:301 +#: dos2unix.pod:311 msgid "Print number of DOS line breaks." msgstr "Skriv ut antal DOS-radbrytningar." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:313 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:315 msgid "Print number of Unix line breaks." msgstr "Skriv ut antal Unix-radbrytningar." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:317 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:319 msgid "Print number of Mac line breaks." msgstr "Skriv ut antal Mac-radbrytningar." #. type: =item -#: dos2unix.pod:311 +#: dos2unix.pod:321 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:323 msgid "Print the byte order mark." msgstr "Skriv ut byteordningsmarkeringen." #. type: =item -#: dos2unix.pod:315 +#: dos2unix.pod:325 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:317 +#: dos2unix.pod:327 msgid "Print if file is text or binary." msgstr "Skriv ut om filen är text eller binär." #. type: =item -#: dos2unix.pod:319 +#: dos2unix.pod:329 +msgid "B" +msgstr "B" + +#. type: textblock +#: dos2unix.pod:331 +msgid "Print the type of the line break of the last line, or C if there is none." +msgstr "Skriv ut radbrytningstypen på sista raden, eller C om det inte finns någon." + +#. type: =item +#: dos2unix.pod:333 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:321 +#: dos2unix.pod:335 msgid "Print only the files that would be converted." msgstr "Skriv bara ut filerna som skulle ha konverterats." #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:337 msgid "With the C flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Med C-flaggan kommer dos2unix att skriva ut filerna som innehåller DOS-radbrytningar, unix2dos kommer bara att skriva ut filnamn som har Unix-radbrytningar." +#. type: textblock +#: dos2unix.pod:340 +msgid "If in addition option C<-e> or C<--add-eol> is used also the files that lack a line break on the last line will be printed." +msgstr "Om dessutom flaggan C<-e> eller C<--add-eol> används så kommer även filer som saknar en radbrytning på sista raden att skrivas ut." + #. type: =item -#: dos2unix.pod:326 +#: dos2unix.pod:343 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:345 msgid "Print a header." msgstr "Skriv ut rubrik." #. type: =item -#: dos2unix.pod:330 +#: dos2unix.pod:347 msgid "B

" msgstr "B

" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:349 msgid "Show file names without path." msgstr "Visa filnamn utan sökväg." #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:353 msgid "Examples:" msgstr "Exempel:" #. type: textblock -#: dos2unix.pod:338 +#: dos2unix.pod:355 msgid "Show information for all *.txt files:" msgstr "Visa information för alla *.txt-filer:" #. type: verbatim -#: dos2unix.pod:340 +#: dos2unix.pod:357 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -554,12 +590,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:342 +#: dos2unix.pod:359 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Visa bara antalet DOS-radbrytningar och Unix-radbrytningar:" #. type: verbatim -#: dos2unix.pod:344 +#: dos2unix.pod:361 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -569,12 +605,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:346 +#: dos2unix.pod:363 msgid "Show only the byte order mark:" msgstr "Visa bara byteordningsmarkeringen:" #. type: verbatim -#: dos2unix.pod:348 +#: dos2unix.pod:365 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -584,12 +620,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:350 +#: dos2unix.pod:367 msgid "List the files that have DOS line breaks:" msgstr "Lista filerna som har DOS-radbrytningar:" #. type: verbatim -#: dos2unix.pod:352 +#: dos2unix.pod:369 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -599,12 +635,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:354 +#: dos2unix.pod:371 msgid "List the files that have Unix line breaks:" msgstr "Lista filerna som har Unix-radbrytningar:" #. type: verbatim -#: dos2unix.pod:356 +#: dos2unix.pod:373 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -614,12 +650,27 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:358 +#: dos2unix.pod:375 +msgid "List the files that have DOS line breaks or lack a line break on the last line:" +msgstr "Lista filerna som har DOS-radbrytningar eller saknar en radbrytning på sista raden:" + +#. type: verbatim +#: dos2unix.pod:377 +#, no-wrap +msgid "" +" dos2unix -e -ic *.txt\n" +"\n" +msgstr "" +" dos2unix -e -ic *.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:379 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "Konvertera endast filer som har DOS-radbrytningar och lämna övriga filer orörda:" #. type: verbatim -#: dos2unix.pod:360 +#: dos2unix.pod:381 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -629,12 +680,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:362 +#: dos2unix.pod:383 msgid "Find text files that have DOS line breaks:" msgstr "Hitta textfiler som har DOS-radbrytningar:" #. type: verbatim -#: dos2unix.pod:364 +#: dos2unix.pod:385 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -644,122 +695,122 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:366 +#: dos2unix.pod:387 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:368 +#: dos2unix.pod:389 msgid "Keep the date stamp of output file same as input file." msgstr "Behåll infilens datumstämpel för utfilen." #. type: =item -#: dos2unix.pod:370 +#: dos2unix.pod:391 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:372 +#: dos2unix.pod:393 msgid "Display program's license." msgstr "Visa programmets licens." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:395 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:397 msgid "Add additional newline." msgstr "Lägg till ytterligare nyrad." #. type: textblock -#: dos2unix.pod:378 +#: dos2unix.pod:399 msgid "B: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B: Endast DOS-radbrytningar ändras till två Unix-radbrytningar. I Mac-läge ändras endast Mac-radbrytningar till två Unix-radbrytningar." #. type: textblock -#: dos2unix.pod:382 +#: dos2unix.pod:403 msgid "B: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B: Endast Unix-radbrytningar ändras till två DOS-radbrytningar. I Mac-läge ändras Unix-radbrytningar till två Mac-radbrytningar." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:406 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:408 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "Skriv en byteordningsmarkering (Byte Order Mark, BOM) i utfilen. Som standard skrivs en UTF-8 BOM." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:411 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "När infilen är UTF-16, och flaggan C<-u> används, kommer en UTF-16 BOM att skrivas." #. type: textblock -#: dos2unix.pod:393 +#: dos2unix.pod:414 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "Använd aldrig denna flagga när kodningen för utmatning är något annat än UTF-8, UTF-16 eller GB18030. Se vidare i avsnittet UNICODE." #. type: =item -#: dos2unix.pod:397 +#: dos2unix.pod:418 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile INFIL UTFIL …>" #. type: textblock -#: dos2unix.pod:399 +#: dos2unix.pod:420 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I be used or you I lose your files." msgstr "Nyfilsläge. Konvertera filen INFIL och skriv utfilen UTFIL. Filnamnen måste ange i par och jokertecken i namnen ska I användas annars I du att förlora filer." #. type: textblock -#: dos2unix.pod:403 +#: dos2unix.pod:424 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "Användaren som påbörjar konverteringen i nyfilsläge (parat läge) kommer att bli ägaren till den konverterade filen. Läs-/skrivbehörigheter för den nya filen kommer att vara samma behörigheter som för originalfilen minus umask(1) för användaren som kör konverteringen." #. type: =item -#: dos2unix.pod:408 +#: dos2unix.pod:429 msgid "B<--no-allow-chown>" msgstr "B<--no-allow-chown>" #. type: textblock -#: dos2unix.pod:410 +#: dos2unix.pod:431 msgid "Don't allow file ownership change in old file mode (default)." msgstr "Tillåt inte ändring av ägarskap i gammalt filläge (standard)" #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:433 msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." msgstr "Avbryt konvertering när användar- och/eller gruppägarskap för originalfilen inte kan bevaras i gammalt filläge. Se också flaggorna C<-o> och C<-n>. Denna flagga är endast tillgänglig om dos2unix har stöd för att bevara användar- och gruppägarskap för filer." #. type: =item -#: dos2unix.pod:417 +#: dos2unix.pod:438 msgid "B<--no-add-eol>" msgstr "B<--no-add-eol>" #. type: textblock -#: dos2unix.pod:419 +#: dos2unix.pod:440 msgid "Do not add a line break to the last line if there isn't one." msgstr "Lägg inte till en radbrytning på den sista raden om det inte finns någon." #. type: =item -#: dos2unix.pod:421 +#: dos2unix.pod:442 msgid "B<-O, --to-stdout>" msgstr "B<-O, --to-stdout>" #. type: textblock -#: dos2unix.pod:423 +#: dos2unix.pod:444 msgid "Write to standard output, like a Unix filter. Use option C<-o> to go back to old file (in-place) mode." msgstr "Skriv till standard ut som ett Unix-filter. Använd flaggan C<-o> för att återgå till det gamla (på-plats) filläget." #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:447 msgid "Combined with option C<-e> files can be properly concatenated. No merged last and first lines, and no Unicode byte order marks in the middle of the concatenated file. Example:" msgstr "Kombinerat med flaggan C<-e> kan filer konkateneras korrekt. Inga sammanfogade sista och första rader, och inga Unicode byteordningsmarkeringar i mitten på den konkatenerade filen. Exempel:" #. type: verbatim -#: dos2unix.pod:430 +#: dos2unix.pod:451 #, no-wrap msgid "" " dos2unix -e -O file1.txt file2.txt > output.txt\n" @@ -769,32 +820,32 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:432 +#: dos2unix.pod:453 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile FIL …>" #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:455 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "Gammalfilsläge. Konvertera filen FIL och skriv över den med utmatningen. Programmet kör i detta läge som standard. Jokertecken i filnamn får användas." #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:458 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "I gammalfilsläge (på-plats läge) kommer den konverterade filen att få samma ägare, grupp samt läs-/skrivbehörigheter som originalfilen. Även då filen konverteras av en annan användare som har skrivbehörighet för filen (t.ex. användaren root). Konverteringen kommer att avbrytas när det inte är möjligt att bevara originalvärdena. Byte av ägare skulle kunna innebära att originalägaren inte längre kan läsa filen. Byte av grupp skulle kunna vara en säkerhetsrisk, filen skulle kunna bli läsbar för användare som den inte är avsedd för. Stöd för bevarande av ägare, grupp och läs-/skrivbehörigheter finns bara i Unix." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:467 msgid "To check if dos2unix has support for preserving the user and group ownership of files type C." msgstr "För att kontrollera om dos2unix har stöd för att bevara användar- och gruppägarskap för filer skriv C." #. type: textblock -#: dos2unix.pod:449 +#: dos2unix.pod:470 msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" msgstr "Konvertering görs alltid via en temporärfil. När ett fel inträffar halvvägs i konverteringen tas den temporära filen bort och originalfilen finns kvar intakt. Om konverteringen är framgångsrik kommer originalfilen att ersättas med temporärfilen. Du kanske har skrivrättigheter till originalfilen men inte rättigheter att ställa in samma användar- och/eller grupprättighetsegenskaper på temporärfilen som originalfilen har. Detta innebär att du inte kan bevara användar- och/eller gruppägarskapet för originalfilen. I detta fall kan du använda flaggan C<--allow-chown> för att fortsätta konverteringen:" #. type: verbatim -#: dos2unix.pod:458 +#: dos2unix.pod:479 #, no-wrap msgid "" " dos2unix --allow-chown foo.txt\n" @@ -804,12 +855,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:460 +#: dos2unix.pod:481 msgid "Another option is to use new file mode:" msgstr "Ett annat alternativ är att använda nyfilsläge:" #. type: verbatim -#: dos2unix.pod:462 +#: dos2unix.pod:483 #, no-wrap msgid "" " dos2unix -n foo.txt foo.txt\n" @@ -819,227 +870,227 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:485 msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." msgstr "Fördelen med flaggan C<--allow-chown> är att du kan använda jokertecken och att ägarskapsegenskaper om möjligt kommer att bevaras." #. type: =item -#: dos2unix.pod:467 +#: dos2unix.pod:488 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:469 +#: dos2unix.pod:490 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Tyst drift. Undertryck alla varningar och meddelanden. Returvärdet är noll. Utom när felaktiga kommandoradsflaggor används." #. type: =item -#: dos2unix.pod:472 +#: dos2unix.pod:493 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:495 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "Ta bort byteordningsmarkering (Byte Order Mark, BOM). Skriv inte en BOM i utfilen. Detta är standardbeteende vid konvertering av Unix-radbrytningar. Se vidare flaggan C<-b>." #. type: =item -#: dos2unix.pod:478 +#: dos2unix.pod:499 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:501 msgid "Skip binary files (default)." msgstr "Hoppa över binära filer (standard)." #. type: textblock -#: dos2unix.pod:482 +#: dos2unix.pod:503 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "Binärfiler hoppas över för att undvika oavsiktliga misstag. Var medveten om att detektering av binärfiler inte är 100% säker. Infiler genomsöks efter binära symboler som typiskt inte återfinns i textfiler. Det är möjligt att en binärfil enbart innehåller texttecken. En sådan binärfil kommer oavsiktligt att ses som en textfil." #. type: =item -#: dos2unix.pod:488 +#: dos2unix.pod:509 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:490 +#: dos2unix.pod:511 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "Behåll infilens original UTF-16-kodning. Utfilen kommer att skrivas med samma UTF-16-kodning som infilen, omvänd eller rak byteordning (little eller big endian). Detta förhindrar transformation till UTF-8. En UTF-16 BOM kommer att skrivas i enlighet med detta. Denna flagga kan inaktiveras med C<-ascii>-flaggan." #. type: =item -#: dos2unix.pod:495 +#: dos2unix.pod:516 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:497 +#: dos2unix.pod:518 msgid "Assume that the input file format is UTF-16LE." msgstr "Antag att infilsformatet är UTF-16LE." #. type: textblock -#: dos2unix.pod:499 +#: dos2unix.pod:520 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "När det finns en byteordningsmarkering (Byte Order Mark) i infilen så har BOM:en högre prioritet än denna flagga." #. type: textblock -#: dos2unix.pod:502 +#: dos2unix.pod:523 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "När du har gjort fel antagande (infilen var inte i UTF-16LE-format) och konverteringens lyckas, kommer du att få en UTF-8 utfil med felaktig text. Du kan göra denna konvertering ogjord med iconv(1) genom att konvertera UTF-8 utfilen tillbaka till UTF-16LE. Detta kommer att återskapa originalfilen." #. type: textblock -#: dos2unix.pod:507 +#: dos2unix.pod:528 msgid "The assumption of UTF-16LE works as a I. By switching to the default I mode the UTF-16LE assumption is turned off." msgstr "Antagandet om UTF-16LE fungerar som ett I. Genom att växla till standard I-läget kommer UTF-16LE antagandet att stängas av." #. type: =item -#: dos2unix.pod:510 +#: dos2unix.pod:531 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:512 +#: dos2unix.pod:533 msgid "Assume that the input file format is UTF-16BE." msgstr "Antag att infilsformatet är UTF-16BE." #. type: textblock -#: dos2unix.pod:514 +#: dos2unix.pod:535 msgid "This option works the same as option C<-ul>." msgstr "Denna flagga fungerar på samma sätt som flaggan C<-ul>." #. type: =item -#: dos2unix.pod:516 +#: dos2unix.pod:537 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:518 +#: dos2unix.pod:539 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "Visa utförliga meddelanden. Extra information visas om byteordningsmarkeringar och antalet konverterade radbrytningar." #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:542 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:523 +#: dos2unix.pod:544 msgid "Follow symbolic links and convert the targets." msgstr "Följ symboliska länkar och konvertera målen." #. type: =item -#: dos2unix.pod:525 +#: dos2unix.pod:546 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:527 +#: dos2unix.pod:548 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "Ersätt symboliska länkar med konverterade filer (originalmålfilerna förblir oförändrade)." #. type: =item -#: dos2unix.pod:530 +#: dos2unix.pod:551 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:532 +#: dos2unix.pod:553 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Behåll symboliska länkar och mål oförändrade (standard)." #. type: =item -#: dos2unix.pod:534 +#: dos2unix.pod:555 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:536 +#: dos2unix.pod:557 msgid "Display version information and exit." msgstr "Visa versionsinformation och avsluta." #. type: =head1 -#: dos2unix.pod:540 +#: dos2unix.pod:561 msgid "MAC MODE" msgstr "MAC-LÄGE" #. type: textblock -#: dos2unix.pod:542 -msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." -msgstr "I normalläge konverteras radbrytningar från DOS till Unix och vice versa. Mac-radbrytningar konverteras inte." +#: dos2unix.pod:563 +msgid "By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." +msgstr "Som standard konverteras radbrytningar från DOS till Unix och vice versa. Mac-radbrytningar konverteras inte." #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:566 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "I Mac-läge konverteras radbrytningar från Mac till Unix och vice versa. DOS-radbrytningar ändras ej." #. type: textblock -#: dos2unix.pod:548 +#: dos2unix.pod:569 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C or C." msgstr "För att köra i Mac-läge använd kommandoradsflaggan C<-c mac> eller använd kommandona C eller C." #. type: =head1 -#: dos2unix.pod:551 +#: dos2unix.pod:572 msgid "CONVERSION MODES" msgstr "KONVERTERINGSLÄGEN" #. type: =item -#: dos2unix.pod:555 +#: dos2unix.pod:576 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:557 -msgid "In mode C only line breaks are converted. This is the default conversion mode." -msgstr "I läget C konverteras enbart radbrytningar. Detta är standardkonverteringsläget." +#: dos2unix.pod:578 +msgid "This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling B mode disables B<7bit> and B mode." +msgstr "Detta är standardkonverteringsläget. Detta läge används för att konvertera ASCII och ASCII-kompatibla kodade filer, så som UTF-8. Att aktiveras B-läge inaktiverar B<7bit>- och B-läge." #. type: textblock -#: dos2unix.pod:560 -msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." -msgstr "Även om namnet på detta läge är ASCII, vilket är en 7-bitarsstandard, så är det läget egentligen ett 8-bitarsläge. Använd alltid detta läge vid konvertering av Unicode UTF-8-filer." +#: dos2unix.pod:582 +msgid "If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has UTF-16 support type C. See also section UNICODE." +msgstr "Om dos2unix har UTF-16 stöd kommer UTF-16-kodade filer att konverteras till kodningen för den aktuella lokalen på POSIX-sytstem och till UTF-8 på Windows. Aktivering av B-läget inaktiverar flaggan för att behålla UTF-16-kodning (C<-u>) och flaggorna för att anta UTF-16 indata (C<-ul> och C<-ub>). För att se om dos2unix har UTF-16-stöd skriv C, se också avsnittet UNICODE." #. type: =item -#: dos2unix.pod:564 +#: dos2unix.pod:588 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:566 +#: dos2unix.pod:590 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "I detta läge konverteras alla 8-bitars icke-ASCII tecken (med värden från 128 till 255) till ett 7-bitars blanksteg." #. type: =item -#: dos2unix.pod:569 +#: dos2unix.pod:593 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:571 +#: dos2unix.pod:595 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Tecken konverteras mellan DOS teckenuppsättning (teckentabell) och ISO teckenuppsättning ISO-8859-1 (Latin-1) på Unix. DOS tecken utan motsvarande ISO-8859-1 tecken, för vilka konvertering är omöjligt, kommer att ersättas med en punkt. Detsamma gäller för ISO-8859-1 tecken utan motsvarighet i DOS." #. type: textblock -#: dos2unix.pod:576 +#: dos2unix.pod:600 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "När enbart flaggan C<-iso> används kommer dos2unix att försöka avgöra den aktiva teckentabellen. När detta inte är möjligt kommer dos2unix att använda standardteckentabellen CP437, vilken huvudsakligen används i USA. För att tvinga en specifik teckentabell använd flaggorna C<-437> (USA), C<-850> (Västeuropeisk), C<-860> (Portugisisk), C<-863> (Fransk-kanadensisk) eller C<-865> (Nordisk). Det finns också stöd för Windows-teckentabell CP-1252 (Västeuropeisk) via flaggan C<-1252>. För andra teckentabeller använd dos2unix i kombination med iconv(1). iconv kan konvertera mellan en lång lista av teckenkodningar." #. type: textblock -#: dos2unix.pod:585 +#: dos2unix.pod:609 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "Använd aldrig ISO-konvertering på Unicode-textfiler. Det kommer att korrumpera UTF-8-kodade filer." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:611 msgid "Some examples:" msgstr "Några exempel:" #. type: textblock -#: dos2unix.pod:589 +#: dos2unix.pod:613 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Konvertera från DOS standardteckentabell till Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:591 +#: dos2unix.pod:615 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -1049,12 +1100,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:593 +#: dos2unix.pod:617 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Konvertera från DOS CP850 till Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:595 +#: dos2unix.pod:619 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -1064,12 +1115,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:597 +#: dos2unix.pod:621 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Konvertera från Windows CP1252 till Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:599 +#: dos2unix.pod:623 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -1079,12 +1130,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:601 +#: dos2unix.pod:625 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Konvertera från Windows CP1252 till Unix UTF-8 (Unicode):" #. type: verbatim -#: dos2unix.pod:603 +#: dos2unix.pod:627 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -1094,12 +1145,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:605 +#: dos2unix.pod:629 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Konvertera från Unix Latin-1 till DOS-standardteckentabell:" #. type: verbatim -#: dos2unix.pod:607 +#: dos2unix.pod:631 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -1109,12 +1160,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:609 +#: dos2unix.pod:633 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Konvertera från Unix Latin-1 till DOS CP850:" #. type: verbatim -#: dos2unix.pod:611 +#: dos2unix.pod:635 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1124,12 +1175,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:637 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Konvertera från Unix Latin-1 till Windows CP1252:" #. type: verbatim -#: dos2unix.pod:615 +#: dos2unix.pod:639 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1139,12 +1190,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:617 +#: dos2unix.pod:641 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Konvertera från Unix UTF-8 (Unicode) till Windows CP1252:" #. type: verbatim -#: dos2unix.pod:619 +#: dos2unix.pod:643 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1154,142 +1205,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:621 +#: dos2unix.pod:645 msgid "See also L and L." msgstr "Se även L och L." #. type: =head1 -#: dos2unix.pod:626 +#: dos2unix.pod:650 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:628 +#: dos2unix.pod:652 msgid "Encodings" msgstr "Kodningar" #. type: textblock -#: dos2unix.pod:630 +#: dos2unix.pod:654 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Det finns flera olika Unicode kodningar. I Unix och Linux kodas filer vanligtvis med UTF-8-kodning. I Windows kan Unicode-textfiler kodas i UTF-8, UTF-16 eller UTF-16 rak byteordning (big endian), men kodas mestadels i UTF-16-format." #. type: =head2 -#: dos2unix.pod:635 +#: dos2unix.pod:659 msgid "Conversion" msgstr "Konvertering" #. type: textblock -#: dos2unix.pod:637 -msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." -msgstr "Unicode-textfiler kan ha DOS, Unix eller Mac-radbrytningar precis som vanliga textfiler." +#: dos2unix.pod:661 +msgid "Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files." +msgstr "Unicode-textfiler kan ha DOS, Unix eller Mac-radbrytningar precis som ASCII-textfiler." #. type: textblock -#: dos2unix.pod:640 +#: dos2unix.pod:664 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Alla versioner av dos2unix och unix2dos kan konvertera UTF-8-kodade filer, eftersom UTF-8 designades för bakåtkompatibilitet med ASCII." #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:667 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C." msgstr "Dos2unix och unix2dos med Unicode-UTF-16-stöd, kan läsa UTF-16-kodade textfiler i omvänd och rak byteordning (little och big endian). För att se om dos2unix byggts med UTF-16-stöd skriv C." #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:671 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "Under Unix/Linux kommer UTF-16-kodade filer att konverteras till lokalens teckenkodning. Använd kommandot locale(1) för att ta reda på vilken lokalens teckenkodning är. När konvertering inte är möjlig kommer ett konverteringsfel att inträffa och filen kommer att hoppas över." #. type: textblock -#: dos2unix.pod:652 +#: dos2unix.pod:676 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "Under Windows konverteras UTF-16-filer som standard till UTF-8. UTF-8-formaterade textfiler har bra stöd både under Windows och Unix/Linux." #. type: textblock -#: dos2unix.pod:655 +#: dos2unix.pod:679 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "UTF-16- och UTF-8-kodning är fullt kompatibla, ingen text kommer att gå förlorad i konverteringen. När ett UTF-16 till UTF-8-konverteringsfel uppstår, till exempel när infilen i UTF-16-format innehåller ett fel, kommer att filen att hoppas över." #. type: textblock -#: dos2unix.pod:659 +#: dos2unix.pod:683 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "När flaggan C<-u> används kommer utfilen att skrivas med samma UTF-16-kodning som infilen. Flaggan C<-u> förhindrar konvertering till UTF-8." #. type: textblock -#: dos2unix.pod:662 +#: dos2unix.pod:686 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "Dos2unix och unix2dos har ingen flagga för att konvertera UTF-8-filer till UTF-16." #. type: textblock -#: dos2unix.pod:664 +#: dos2unix.pod:688 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "ISO- och 7-bitarslägeskonvertering fungerar inte på UTF-16-filer." #. type: =head2 -#: dos2unix.pod:666 +#: dos2unix.pod:690 msgid "Byte Order Mark" msgstr "Byteordningsmarkering (Byte Order Mark)" #. type: textblock -#: dos2unix.pod:668 -msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." -msgstr "I Windows har Unicode-textfiler typiskt en byteordningsmarkering (Byte Order Mark, BOM) eftersom många Windows-program (inklusive Notepad) lägger till BOM:ar som standard. Se även L." +#: dos2unix.pod:692 +msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." +msgstr "I Windows har Unicode-textfiler typiskt en byteordningsmarkering (Byte Order Mark, BOM) eftersom många Windows-program (inklusive Notepad) lägger till BOM:ar som standard. Se även L." #. type: textblock -#: dos2unix.pod:672 +#: dos2unix.pod:696 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "I Unix har Unicode-textfiler typiskt ingen BOM. Filer antas vara kodade i den lokala teckenuppsättningen." #. type: textblock -#: dos2unix.pod:675 +#: dos2unix.pod:699 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "Dos2Unix kan bara detektera om en fil är i UTF-16-format om filen har en BOM. När en UTF-16-fil inte har en BOM så kommer dos2unix att de filen som en binärfil." #. type: textblock -#: dos2unix.pod:679 +#: dos2unix.pod:703 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Använd flaggan C<-ul> eller C<-ub> för att konvertera en UTF-16-fil utan BOM." #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:705 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "Dos2unix skriver som standard ingen BOM i utfilen. Med flaggan C<-b> kommer Dos2unix att skriva en BOM när infilen har en BOM." #. type: textblock -#: dos2unix.pod:684 +#: dos2unix.pod:708 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "Unix2dos skriver som standard en BOM i utfilen när infilen har en BOM. Använd flaggan C<-r> för att ta bort BOM:en." #. type: textblock -#: dos2unix.pod:687 +#: dos2unix.pod:711 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "Dos2unix och unix2dos skriver alltid en BOM när flaggan C<-m> används." #. type: =head2 -#: dos2unix.pod:689 +#: dos2unix.pod:713 msgid "Unicode file names on Windows" msgstr "Unicode-filnamn under Windows" #. type: textblock -#: dos2unix.pod:691 +#: dos2unix.pod:715 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C." msgstr "Dos2unix har valfritt stöd för läsning och skrivning av Unicode-filnamn i Windows kommandoprompt. Detta innebär att dos2unix kan öppna filer som har tecken i sina namn som inte är en del av systemets atandard ANSI-teckentabell. För att se om dos2unix för Windows byggdes med stöd för Unicode-filnamn skriv C." #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:721 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "Det finns en del problem med att visa Unicode-filnamn i en Windows-konsol. Se vidare flaggan C<-D>, C<--display-enc>. Filnamnen kan visas felaktigt i konsolen, men filerna som skrivs kommer att ha de korrekta namnen." #. type: =head2 -#: dos2unix.pod:701 +#: dos2unix.pod:725 msgid "Unicode examples" msgstr "Unicode-exempel" #. type: textblock -#: dos2unix.pod:703 +#: dos2unix.pod:727 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Konvertera från Windows UTF-16 (med BOM) till Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:705 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1299,12 +1350,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:731 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Konvertera från Windows UTF-16LE (utan BOM) till Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:733 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1314,12 +1365,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:735 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Konvertera från Unix UTF-8 till Windows UTF-8 med BOM:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:737 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1329,12 +1380,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:739 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Konvertera från Unix UTF-8 till Windows UTF-16:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:741 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1344,47 +1395,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:719 +#: dos2unix.pod:743 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:721 -msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." -msgstr "GB18030 är en standard från Kinesiska regeringen. En obligatorisk delmängd av standarden GB18030 krävs officiellt för alla programvaruprodukter som säljs i Kina. Se vidare L." +#: dos2unix.pod:745 +msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." +msgstr "GB18030 är en standard från Kinesiska regeringen. En obligatorisk delmängd av standarden GB18030 krävs officiellt för alla programvaruprodukter som säljs i Kina. Se vidare L." #. type: textblock -#: dos2unix.pod:725 +#: dos2unix.pod:749 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "GB18030 är fullständigt kompatibel med Unicode och kan anses vara ett överföringsformat för unicode. Precis som UTF-8 är GB18030 kompatibel med ASCII. GB18030 är också kompatibel med Windows-teckentabell 936, också känd som GBK." #. type: textblock -#: dos2unix.pod:729 +#: dos2unix.pod:753 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C to get the list of supported locales." msgstr "Under Unix/Linux kommer UTF-16-filer att konverteras till GB18030 när lokalens teckenkodning är inställd på GB18030. Notera att detta endast kommer att fungera om lokalen har stöd i systemet. Använd kommandot C för att få en lista över de lokaler som stöds." #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:757 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "Under Windows måste du använda flaggan C<-gb> för att konvertera UTF-16-filer till GB18030." #. type: textblock -#: dos2unix.pod:735 +#: dos2unix.pod:759 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "GB18030-kodade filer kan ha en byteordningsmarkering, precis som Unicode-filer." #. type: =head1 -#: dos2unix.pod:737 +#: dos2unix.pod:761 msgid "EXAMPLES" msgstr "EXEMPEL" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:763 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Läsa inmatning från “stdin“ och skriv utmatning till “stdout“:" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:765 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1396,12 +1447,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:744 +#: dos2unix.pod:768 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "Konvertera och ersätta a.txt. Konvertera och ersätt b.txt:" #. type: verbatim -#: dos2unix.pod:746 +#: dos2unix.pod:770 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1413,12 +1464,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:749 +#: dos2unix.pod:773 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "Konvertera och ersätt a.txt i ascii-konverteringsläge:" #. type: verbatim -#: dos2unix.pod:751 +#: dos2unix.pod:775 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1428,12 +1479,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:753 +#: dos2unix.pod:777 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "Konvertera och ersätt a.txt i ascii-konverteringsläge, konvertera och ersätt b.txt i 7bit-konverteringsläge:" #. type: verbatim -#: dos2unix.pod:756 +#: dos2unix.pod:780 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1447,12 +1498,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:760 +#: dos2unix.pod:784 msgid "Convert a.txt from Mac to Unix format:" msgstr "Konvertera a.txt från Mac- till Unix-format:" #. type: verbatim -#: dos2unix.pod:762 +#: dos2unix.pod:786 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1464,12 +1515,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:765 +#: dos2unix.pod:789 msgid "Convert a.txt from Unix to Mac format:" msgstr "Konvertera a.txt från Unix- till Mac-format:" #. type: verbatim -#: dos2unix.pod:767 +#: dos2unix.pod:791 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1481,12 +1532,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:770 +#: dos2unix.pod:794 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "Konvertera och ersätt a.txt medan originalet tidsstämpel behålls:" #. type: verbatim -#: dos2unix.pod:772 +#: dos2unix.pod:796 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1498,12 +1549,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:775 +#: dos2unix.pod:799 msgid "Convert a.txt and write to e.txt:" msgstr "Konvertera a.txt och skriv till e.txt:" #. type: verbatim -#: dos2unix.pod:777 +#: dos2unix.pod:801 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1513,12 +1564,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:779 +#: dos2unix.pod:803 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "Konvertera a.txt och skriv till e.txt, låt e.txt behålla tidsstämpeln från a.txt:" #. type: verbatim -#: dos2unix.pod:781 +#: dos2unix.pod:805 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1528,12 +1579,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:783 +#: dos2unix.pod:807 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "Konvertera och ersätt a.txt, konvertera b.txt och skriv till e.txt:" #. type: verbatim -#: dos2unix.pod:785 +#: dos2unix.pod:809 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1545,12 +1596,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:788 +#: dos2unix.pod:812 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "Konvertera c.txt och skriv till e.txt, konvertera och ersätt a.txt, konvertera och ersätt b.txt, konvertera d.txt och skriv till f.txt:" #. type: verbatim -#: dos2unix.pod:791 +#: dos2unix.pod:815 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1560,17 +1611,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:793 +#: dos2unix.pod:817 msgid "RECURSIVE CONVERSION" msgstr "REKURSIV KONVERTERING" #. type: textblock -#: dos2unix.pod:795 +#: dos2unix.pod:819 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "I ett Unix-skal kan kommandona find(1) och xargs(1) användas för att köra dos2unix rekursivt över alla textfiler i ett katalogträd. För att till exempel konvertera alla .txt-filer i katalogträdet under den aktuella katalogen skriv:" #. type: verbatim -#: dos2unix.pod:799 +#: dos2unix.pod:823 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1580,12 +1631,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:801 +#: dos2unix.pod:825 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "Flaggan C<-print0> till find(1) och motsvarande flagga C<-0> till xargs(1) behövs när det finns filer med mellanslag eller citationstecken i namnet. Annars kan dessa flaggor utelämnas. Ett annat alternativ är att användas find(1) med flaggan C<-exec>:" #. type: verbatim -#: dos2unix.pod:805 +#: dos2unix.pod:829 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1595,12 +1646,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:807 +#: dos2unix.pod:831 msgid "In a Windows Command Prompt the following command can be used:" msgstr "I en Windows-kommandoprompt kan följande kommando användas:" #. type: verbatim -#: dos2unix.pod:809 +#: dos2unix.pod:833 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1610,12 +1661,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:811 +#: dos2unix.pod:835 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "PowerShell-användare kan använda följande kommando i Windows PowerShell:" #. type: verbatim -#: dos2unix.pod:813 +#: dos2unix.pod:837 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1625,22 +1676,22 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:816 +#: dos2unix.pod:840 msgid "LOCALIZATION" msgstr "LOKALISERING" #. type: =item -#: dos2unix.pod:820 +#: dos2unix.pod:844 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:822 +#: dos2unix.pod:846 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "Det primära språket väljs med miljövariabeln LANG. LANG-variabeln består av flera delas. Den första delen är språkkoden i gemener. Den andra delen är valfri och utgör landskoden i versaler, föregången av ett understreck. Det finns också en valfri tredje del: teckenkodning, föregången av en punkt. Ett par exempel för skal av POSIX-standard-typ:" #. type: verbatim -#: dos2unix.pod:829 +#: dos2unix.pod:853 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1662,47 +1713,47 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:837 -msgid "For a complete list of language and country codes see the gettext manual: L" -msgstr "För en fullständig lista över språk och landskoder se vidare i gettext-manualen: L" +#: dos2unix.pod:861 +msgid "For a complete list of language and country codes see the gettext manual: L" +msgstr "För en fullständig lista över språk och landskoder se vidare i gettext-manualen: L" #. type: textblock -#: dos2unix.pod:840 +#: dos2unix.pod:864 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "På Unix-system kan du använda kommando locale(1) för att få lokal-specifik information." #. type: =item -#: dos2unix.pod:843 +#: dos2unix.pod:867 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:845 -msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" -msgstr "Med miljövariabeln LANGUAGE kan du ange en prioritetslista över språk, separerade med kolon. Dos2unix kommer att ge företräde till LANGAUGE över LANG. Exempelvis först nederländska och sedan tyska: C. Du måste först ha aktiverat lokalisering, genom att sätta LANG (eller LC_ALL) till ett värde annat än “C“, innan du kan använda en prioritetslista för språk via LANGUAGE-variabeln. Se vidare i gettext-manualen: L" +#: dos2unix.pod:869 +msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" +msgstr "Med miljövariabeln LANGUAGE kan du ange en prioritetslista över språk, separerade med kolon. Dos2unix kommer att ge företräde till LANGAUGE över LANG. Exempelvis först nederländska och sedan tyska: C. Du måste först ha aktiverat lokalisering, genom att sätta LANG (eller LC_ALL) till ett värde annat än “C“, innan du kan använda en prioritetslista för språk via LANGUAGE-variabeln. Se vidare i gettext-manualen: L" #. type: textblock -#: dos2unix.pod:853 +#: dos2unix.pod:877 msgid "If you select a language which is not available you will get the standard English messages." msgstr "Om du väljer ett språk som inte är tillgänglig kommer du att få engelska meddelanden som standard." #. type: =item -#: dos2unix.pod:857 +#: dos2unix.pod:881 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:859 +#: dos2unix.pod:883 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C. Option B<--version> will display the LOCALEDIR that is used." msgstr "Med miljövariabeln DOS2UNIX_LOCALEDIR kan LOCALEDIR som ställts in vid kompilering åsidosättas. LOCALEDIR används för att hitta språkfiler. Standardvärdet för GNU-program är C. Flaggan B<--version> kommer att visa vilken LOCALEDIR som används." #. type: textblock -#: dos2unix.pod:864 +#: dos2unix.pod:888 msgid "Example (POSIX shell):" msgstr "Exempel (POSIX-skal):" #. type: verbatim -#: dos2unix.pod:866 +#: dos2unix.pod:890 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1712,75 +1763,84 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:871 +#: dos2unix.pod:895 msgid "RETURN VALUE" msgstr "RETURVÄRDE" #. type: textblock -#: dos2unix.pod:873 +#: dos2unix.pod:897 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "Om allt går bra kommer noll att returneras. När ett systemfel uppstår kommer det senaste systemfelet att returneras. För andra fel kommer 1 att returneras." #. type: textblock -#: dos2unix.pod:876 +#: dos2unix.pod:900 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "Returvärdet är alltid noll i tyst läge, utom när felaktiga kommandoradsflaggor används." #. type: =head1 -#: dos2unix.pod:879 +#: dos2unix.pod:903 msgid "STANDARDS" msgstr "STANDARDER" #. type: textblock -#: dos2unix.pod:881 -msgid "L" -msgstr "L" +#: dos2unix.pod:905 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:883 -msgid "L" -msgstr "L" +#: dos2unix.pod:907 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:885 -msgid "L" -msgstr "L" +#: dos2unix.pod:909 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:887 -msgid "L" -msgstr "L" +#: dos2unix.pod:911 +msgid "L" +msgstr "L" #. type: =head1 -#: dos2unix.pod:889 +#: dos2unix.pod:913 msgid "AUTHORS" msgstr "FÖRFATTARE" #. type: textblock -#: dos2unix.pod:891 +#: dos2unix.pod:915 msgid "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer)" msgstr "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix-läge) - , Christian Wurll (lägg till en extra radbrytning) - , Erwin Waterlander - (upphovsman)" #. type: textblock -#: dos2unix.pod:896 -msgid "Project page: L" -msgstr "Projektsida: L" +#: dos2unix.pod:920 +msgid "Project page: L" +msgstr "Projektsida: L" #. type: textblock -#: dos2unix.pod:898 -msgid "SourceForge page: L" -msgstr "SourceForge-sida: L" +#: dos2unix.pod:922 +msgid "SourceForge page: L" +msgstr "SourceForge-sida: L" #. type: =head1 -#: dos2unix.pod:900 +#: dos2unix.pod:924 msgid "SEE ALSO" msgstr "SE ÄVEN" #. type: textblock -#: dos2unix.pod:902 +#: dos2unix.pod:926 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" +#~ msgid "Convert only line breaks. This is the default conversion mode." +#~ msgstr "Konvertera enbart radbrytningar. Detta är standardkonverteringsläget." + +#~ msgid "In mode C only line breaks are converted. This is the default conversion mode." +#~ msgstr "I läget C konverteras enbart radbrytningar. Detta är standardkonverteringsläget." + +#~ msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." +#~ msgstr "Även om namnet på detta läge är ASCII, vilket är en 7-bitarsstandard, så är det läget egentligen ett 8-bitarsläge. Använd alltid detta läge vid konvertering av Unicode UTF-8-filer." + #~ msgid "" #~ " find -name '*.txt' | xargs dos2unix -ic\n" #~ "\n" diff --git a/dos2unix/po-man/uk.po b/dos2unix/po-man/uk.po index 64640a3..d69e60f 100644 --- a/dos2unix/po-man/uk.po +++ b/dos2unix/po-man/uk.po @@ -6,9 +6,9 @@ # Yuri Chornoivan , 2014, 2015, 2016, 2017, 2022, 2023. msgid "" msgstr "" -"Project-Id-Version: dos2unix-man 7.5.0-beta5\n" -"POT-Creation-Date: 2023-04-23 10:34+0200\n" -"PO-Revision-Date: 2023-04-26 21:08+0300\n" +"Project-Id-Version: dos2unix-man 7.5.2-beta3\n" +"POT-Creation-Date: 2023-11-27 22:01+0100\n" +"PO-Revision-Date: 2023-11-29 17:12+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -148,8 +148,8 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:121 -msgid "Convert only line breaks. This is the default conversion mode." -msgstr "Виконати лише перетворення символів розриву рядків. Типовий режим перетворення." +msgid "Default conversion mode. See also section CONVERSION MODES." +msgstr "Типовий режим перетворення. Див. також розділ щодо режимів перетворення." #. type: =item #: dos2unix.pod:123 @@ -402,7 +402,7 @@ msgid "The following information is printed, in this order: number of DOS line b msgstr "Буде виведено такі дані, у вказаному порядку: кількість розривів рядків у форматі DOS, кількість розривів рядків у форматі Unix, кількість розривів рядків у форматі Mac, позначка порядку байтів, текстовим чи бінарним є файл та назву файла." #. type: textblock -#: dos2unix.pod:274 +#: dos2unix.pod:274 dos2unix.pod:290 msgid "Example output:" msgstr "Приклад результатів:" @@ -437,116 +437,152 @@ msgstr "Зауважте, що іноді бінарні файли помилк #. type: textblock #: dos2unix.pod:287 +msgid "If in addition option C<-e> or C<--add-eol> is used also the type of the line break of the last line is printed, or C if there is none." +msgstr "Якщо використано додатковий параметр C<-e> або C<--add-eol>, буде також виведено дані щодо типу розриву рядків для останнього рядка або C, якщо такого немає." + +#. type: verbatim +#: dos2unix.pod:292 +#, no-wrap +msgid "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" +msgstr "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:297 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Крім того, можна вказати додаткові прапорці для внесення змін у виведені дані. Можна використовувати один або декілька таких прапорців." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:302 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:304 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "Виводити рядки даних щодо файла із завершенням на нульовий символ, а не символ розриву рядка. Це уможливлює правильну інтерпретацію назв файлів, що містять пробіли або символи лапок, якщо використано прапорець «c». Скористайтеся цим прапорцем у поєднанні із параметром C<-0> або C<--null> xargs(1)." #. type: =item -#: dos2unix.pod:299 +#: dos2unix.pod:309 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:301 +#: dos2unix.pod:311 msgid "Print number of DOS line breaks." msgstr "Вивести кількість символів розривів рядка DOS." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:313 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:315 msgid "Print number of Unix line breaks." msgstr "Вивести кількість символів розривів рядка Unix." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:317 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:319 msgid "Print number of Mac line breaks." msgstr "Вивести кількість символів розривів рядка Mac." #. type: =item -#: dos2unix.pod:311 +#: dos2unix.pod:321 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:323 msgid "Print the byte order mark." msgstr "Вивести позначку порядку байтів." #. type: =item -#: dos2unix.pod:315 +#: dos2unix.pod:325 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:317 +#: dos2unix.pod:327 msgid "Print if file is text or binary." msgstr "Вивести дані щодо того, є файл текстовим чи бінарним." #. type: =item -#: dos2unix.pod:319 +#: dos2unix.pod:329 +msgid "B" +msgstr "B" + +#. type: textblock +#: dos2unix.pod:331 +msgid "Print the type of the line break of the last line, or C if there is none." +msgstr "Вивести тип розриву рядка в останньому рядку або C, якщо останній рядок не містить розриву рядка." + +#. type: =item +#: dos2unix.pod:333 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:321 +#: dos2unix.pod:335 msgid "Print only the files that would be converted." msgstr "Вивести дані лише тих файлів, які було б перетворено." #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:337 msgid "With the C flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Із прапорцем C dos2unix виведе лише назви файлів, у яких містяться розриви рядків DOS. unix2dos виведе лише назви файлів, у яких містяться розриви рядків Unix." +#. type: textblock +#: dos2unix.pod:340 +msgid "If in addition option C<-e> or C<--add-eol> is used also the files that lack a line break on the last line will be printed." +msgstr "Якщо використано додатковий параметр C<-e> або C<--add-eol>, буде також виведено список файлів, які не містять символу розриву рядка в останньому рядку." + #. type: =item -#: dos2unix.pod:326 +#: dos2unix.pod:343 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:345 msgid "Print a header." msgstr "Вивести заголовок." #. type: =item -#: dos2unix.pod:330 +#: dos2unix.pod:347 msgid "B

" msgstr "B

" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:349 msgid "Show file names without path." msgstr "Показувати назви файлів без шляхів." #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:353 msgid "Examples:" msgstr "Приклади:" #. type: textblock -#: dos2unix.pod:338 +#: dos2unix.pod:355 msgid "Show information for all *.txt files:" msgstr "Вивести дані щодо усіх файлів *.txt:" #. type: verbatim -#: dos2unix.pod:340 +#: dos2unix.pod:357 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -556,12 +592,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:342 +#: dos2unix.pod:359 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Вивести кількість розривів рядків у форматі DOS і розривів рядків у форматі Unix:" #. type: verbatim -#: dos2unix.pod:344 +#: dos2unix.pod:361 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -571,12 +607,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:346 +#: dos2unix.pod:363 msgid "Show only the byte order mark:" msgstr "Вивести лише позначку порядку байтів:" #. type: verbatim -#: dos2unix.pod:348 +#: dos2unix.pod:365 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -586,12 +622,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:350 +#: dos2unix.pod:367 msgid "List the files that have DOS line breaks:" msgstr "Вивести список файлів, у яких є символи розриву рядків DOS:" #. type: verbatim -#: dos2unix.pod:352 +#: dos2unix.pod:369 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -601,12 +637,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:354 +#: dos2unix.pod:371 msgid "List the files that have Unix line breaks:" msgstr "Вивести список файлів, у яких використано символи розриву рядків Unix:" #. type: verbatim -#: dos2unix.pod:356 +#: dos2unix.pod:373 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -616,12 +652,27 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:358 +#: dos2unix.pod:375 +msgid "List the files that have DOS line breaks or lack a line break on the last line:" +msgstr "Вивести список файлів, у яких є символи розриву рядків DOS або якы не містять символу розриву рядка в останньому рядку:" + +#. type: verbatim +#: dos2unix.pod:377 +#, no-wrap +msgid "" +" dos2unix -e -ic *.txt\n" +"\n" +msgstr "" +" dos2unix -e -ic *.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:379 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "Перетворити лише файли із розривами рядків DOS і не чіпати інших файлів:" #. type: verbatim -#: dos2unix.pod:360 +#: dos2unix.pod:381 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -631,12 +682,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:362 +#: dos2unix.pod:383 msgid "Find text files that have DOS line breaks:" msgstr "Знайти текстові файли і розривами рядків DOS:" #. type: verbatim -#: dos2unix.pod:364 +#: dos2unix.pod:385 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -646,122 +697,122 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:366 +#: dos2unix.pod:387 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:368 +#: dos2unix.pod:389 msgid "Keep the date stamp of output file same as input file." msgstr "Зберегти часову позначку файла вхідних даних у файлі результатів перетворення." #. type: =item -#: dos2unix.pod:370 +#: dos2unix.pod:391 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:372 +#: dos2unix.pod:393 msgid "Display program's license." msgstr "Вивести умови ліцензування програми." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:395 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:397 msgid "Add additional newline." msgstr "Вставити додатковий символ розриву рядка." #. type: textblock -#: dos2unix.pod:378 +#: dos2unix.pod:399 msgid "B: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B: перетворення на два символи розриву рядків Unix відбуватиметься лише для комбінацій розриву рядків DOS. У режимі Mac виконуватиметься перетворення на два розриви рядків Unix лише символів розриву рядків Mac." #. type: textblock -#: dos2unix.pod:382 +#: dos2unix.pod:403 msgid "B: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B: перетворення на дві комбінації розриву рядків DOS відбуватиметься лише для символів розриву рядків DOS. У режимі Mac виконуватиметься перетворення на два розриви рядків Mac лише символів розриву рядків Unix." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:406 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:408 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "Записати до файла результатів позначку порядку байтів (BOM). Типово буде записано позначку порядку байтів UTF-8." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:411 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "Якщо дані початкового файла закодовано у UTF-16 і використано параметр C<-u>, буде дописано позначку порядку байтів UTF-16." #. type: textblock -#: dos2unix.pod:393 +#: dos2unix.pod:414 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "Не використовуйте цей параметр для кодувань результатів, відмінних від UTF-8, UTF-16 або GB18030. Див. також розділ щодо UNICODE." #. type: =item -#: dos2unix.pod:397 +#: dos2unix.pod:418 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile ВХІДНИЙ_ФАЙЛ ВИХІДНИЙ_ФАЙЛ ...>" #. type: textblock -#: dos2unix.pod:399 +#: dos2unix.pod:420 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I be used or you I lose your files." msgstr "Новий режим обробки файлів. Перетворити дані з файла ВХІДНИЙ_ФАЙЛ і записати результати до файла ВИХІДНИЙ_ФАЙЛ. Назви файлів слід вказувати парами, I<не слід> використовувати шаблони заміни, інакше вміст файлів I<буде втрачено>." #. type: textblock -#: dos2unix.pod:403 +#: dos2unix.pod:424 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "Власником перетвореного файла буде призначено користувача, яким було розпочато перетворення у режимі нового файла (парному режимі). Права доступу на читання або запис нового файла буде визначено на основі прав доступу до початкового файла мінус umask(1) для користувача, яким було розпочато перетворення." #. type: =item -#: dos2unix.pod:408 +#: dos2unix.pod:429 msgid "B<--no-allow-chown>" msgstr "B<--no-allow-chown>" #. type: textblock -#: dos2unix.pod:410 +#: dos2unix.pod:431 msgid "Don't allow file ownership change in old file mode (default)." msgstr "Не дозволяти зміну власника файла у старому режимі файлів (типова поведінка)." #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:433 msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." msgstr "Переривати перетворення, якщо у старому режимі файлів не вдасться зберегти параметри належності файла до певного користувача і/або групи. Див. також параметри C<-o> і C<-n>. Цим параметром можна скористатися, лише якщо у dos2unix передбачено підтримку збереження параметрів належності файлів певним користувачам і групам." #. type: =item -#: dos2unix.pod:417 +#: dos2unix.pod:438 msgid "B<--no-add-eol>" msgstr "B<--no-add-eol>" #. type: textblock -#: dos2unix.pod:419 +#: dos2unix.pod:440 msgid "Do not add a line break to the last line if there isn't one." msgstr "Не додавати розрив рядка до останнього рядка, якщо його там немає." #. type: =item -#: dos2unix.pod:421 +#: dos2unix.pod:442 msgid "B<-O, --to-stdout>" msgstr "B<-O, --to-stdout>" #. type: textblock -#: dos2unix.pod:423 +#: dos2unix.pod:444 msgid "Write to standard output, like a Unix filter. Use option C<-o> to go back to old file (in-place) mode." msgstr "Записати дані до стандартного виведення, подібного до фільтра Unix. Скористайтеся параметром C<-o>, щоб повернутися до старого режиму файла (на місці)." #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:447 msgid "Combined with option C<-e> files can be properly concatenated. No merged last and first lines, and no Unicode byte order marks in the middle of the concatenated file. Example:" msgstr "У поєднанні із параметром C<-e> файли можна належним чином розрізати. Усередині об'єднаного файла не буде об'єднання останнього і першого рядків і позначок порядку байтів Unicode. Приклад:" #. type: verbatim -#: dos2unix.pod:430 +#: dos2unix.pod:451 #, no-wrap msgid "" " dos2unix -e -O file1.txt file2.txt > output.txt\n" @@ -771,32 +822,32 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:432 +#: dos2unix.pod:453 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile ФАЙЛ ...>" #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:455 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "Застарілий режим обробки. Виконати перетворення файла ФАЙЛ і перезаписати його вміст. Типово, програма працює у цьому режимі. Можна використовувати шаблони заміни." #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:458 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "У застарілому режимі (режимі заміщення) перетворений файл належатиме тому самому власнику і групі і матиме ті самі права доступу на читання або запис, що і початковий файл. Крім того, якщо перетворення файла виконується іншим користувачем, який має права доступу на запис до файла (наприклад користувачем root), перетворення буде перервано, якщо зберегти початкові значення не вдасться. Зміна власника може означати неможливість читання файла для його початкового власника. Зміна групи може призвести до проблем із безпекою, оскільки файл може стати доступним для читання користувачам, які не повинні мати такі права доступу. Можливість збереження прав власності та прав доступу до файла передбачено лише у Unix." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:467 msgid "To check if dos2unix has support for preserving the user and group ownership of files type C." msgstr "Щоб перевірити, чи передбачено у dos2unix підтримку збереження параметрів власника і групи файлів, віддайте команду C." #. type: textblock -#: dos2unix.pod:449 +#: dos2unix.pod:470 msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" msgstr "Перетворення завжди виконується з використанням тимчасового файла. Якщо під час перетворення станеться помилка, тимчасовий файл буде вилучено, а початковий файл залишиться незмінним. Якщо перетворення буде виконано успішно, початковий файл буде замінено на тимчасовий файл. Може так статися, що у вас будуть права на перезапис початкового файла, але не буде прав для встановлення тих самих параметрів власника для тимчасового файла, який замінить собою початковий файл. Це означає, що ви не зможете зберегти параметри належності файла певному користувачу і/або групі. У цьому випадку ви можете скористатися параметром C<--allow-chown>, щоб програма могла продовжити обробку даних:" #. type: verbatim -#: dos2unix.pod:458 +#: dos2unix.pod:479 #, no-wrap msgid "" " dos2unix --allow-chown foo.txt\n" @@ -806,12 +857,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:460 +#: dos2unix.pod:481 msgid "Another option is to use new file mode:" msgstr "Іншим варіантом дій є використання нового режиму файлів:" #. type: verbatim -#: dos2unix.pod:462 +#: dos2unix.pod:483 #, no-wrap msgid "" " dos2unix -n foo.txt foo.txt\n" @@ -821,227 +872,227 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:485 msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." msgstr "Перевагою використання параметра C<--allow-chown> є те, що ви можете користуватися символами-замінниками, а параметри власників буде збережено, якщо можливо." #. type: =item -#: dos2unix.pod:467 +#: dos2unix.pod:488 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:469 +#: dos2unix.pod:490 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Режим без виведення повідомлень. Програма не виводитиме жодних попереджень або повідомлень про помилки. Повернутим значенням завжди буде нуль, якщо вказано правильні параметри командного рядка." #. type: =item -#: dos2unix.pod:472 +#: dos2unix.pod:493 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:495 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "Вилучити позначку порядку байтів (BOM). Не записувати BOM до файла результатів. Це типова поведінка під час перетворення файлів з форматом розриву рядків Unix. Див. також параметр C<-b>." #. type: =item -#: dos2unix.pod:478 +#: dos2unix.pod:499 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:501 msgid "Skip binary files (default)." msgstr "Пропускати двійкові файли (типово)." #. type: textblock -#: dos2unix.pod:482 +#: dos2unix.pod:503 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "Пропускання бінарних файлів реалізовано для того, щоб уникнути випадкових помилок. Майте на увазі, що визначення бінарних файлів не є 100% точним. Програма просто шукає у файлах бінарні символи, які типово не трапляються у текстових файлах. Може так статися, що у бінарному файлі містяться лише звичайні текстові символи. Такий бінарний файл буде помилково сприйнято програмою як текстовий." #. type: =item -#: dos2unix.pod:488 +#: dos2unix.pod:509 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:490 +#: dos2unix.pod:511 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "Зберегти початкове кодування UTF-16. Файл результатів буде записано у тому самому кодуванні UTF-16, із прямим або зворотним порядком байтів, що і початковий файл. Таким чином можна запобігти перетворенню даних у кодування UTF-8. До файла буде записано відповідну позначку порядку байтів UTF-16. Вимкнути цей параметр можна за допомогою параметра C<-ascii>." #. type: =item -#: dos2unix.pod:495 +#: dos2unix.pod:516 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:497 +#: dos2unix.pod:518 msgid "Assume that the input file format is UTF-16LE." msgstr "Припускати, що кодуванням вхідних файлів є UTF-16LE." #. type: textblock -#: dos2unix.pod:499 +#: dos2unix.pod:520 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "Якщо у початковому файлі є позначка порядку байтів (BOM), її буде використано у файлі-результаті, незалежно від використання цього параметра." #. type: textblock -#: dos2unix.pod:502 +#: dos2unix.pod:523 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "Якщо вами було зроблено помилкове припущення щодо формату файла (файл вхідних даних насправді не є файлом у форматі UTF-16LE), і дані вдасться успішно перетворити, ви отримаєте файл у кодуванні UTF-8 з помилковим вмістом. Скасувати таке помилкове перетворення можна за допомогою зворотного перетворення iconv(1) з даних у форматі UTF-8 на дані у форматі UTF-16LE. Таким чином ви повернетеся до початкового кодування даних у файлі." #. type: textblock -#: dos2unix.pod:507 +#: dos2unix.pod:528 msgid "The assumption of UTF-16LE works as a I. By switching to the default I mode the UTF-16LE assumption is turned off." msgstr "Припущення щодо форматування UTF-16LE працює як визначення I<режиму перетворення>. Перемиканням на типовий режим I можна вимкнути припущення щодо форматування UTF-16LE." #. type: =item -#: dos2unix.pod:510 +#: dos2unix.pod:531 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:512 +#: dos2unix.pod:533 msgid "Assume that the input file format is UTF-16BE." msgstr "Припускати, що вхідним форматом є UTF-16BE." #. type: textblock -#: dos2unix.pod:514 +#: dos2unix.pod:535 msgid "This option works the same as option C<-ul>." msgstr "Цей параметр працює у спосіб, тотожний до параметра C<-ul>." #. type: =item -#: dos2unix.pod:516 +#: dos2unix.pod:537 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:518 +#: dos2unix.pod:539 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "Виводити докладні повідомлення. Буде показано додаткові дані щодо позначок порядку байтів та кількості перетворених символів розриву рядків." #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:542 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:523 +#: dos2unix.pod:544 msgid "Follow symbolic links and convert the targets." msgstr "Переходити за символічними посиланням і перетворювати файли, на які вони вказують." #. type: =item -#: dos2unix.pod:525 +#: dos2unix.pod:546 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:527 +#: dos2unix.pod:548 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "Замінити символічні посилання перетвореними файлами (початкові файли, на які вони вказують, змінено не буде)." #. type: =item -#: dos2unix.pod:530 +#: dos2unix.pod:551 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:532 +#: dos2unix.pod:553 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Не змінювати символічні посилання та файли, на які вони посилаються (типово)." #. type: =item -#: dos2unix.pod:534 +#: dos2unix.pod:555 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:536 +#: dos2unix.pod:557 msgid "Display version information and exit." msgstr "Вивести дані щодо версії і завершити роботу." #. type: =head1 -#: dos2unix.pod:540 +#: dos2unix.pod:561 msgid "MAC MODE" msgstr "РЕЖИМ MAC" #. type: textblock -#: dos2unix.pod:542 -msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." -msgstr "У звичайному режимі розриви рядків DOS перетворюються на розриви рядків Unix, і навпаки. Розриви рядків Mac перетворенню не підлягають." +#: dos2unix.pod:563 +msgid "By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." +msgstr "Типово, розриви рядків DOS перетворюються на розриви рядків Unix, і навпаки. Розриви рядків Mac перетворенню не підлягають." #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:566 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "У режимі Mac розриви рядків Mac перетворюються на розриви рядків Unix, і навпаки. Розриви рядків DOS перетворенню не підлягають." #. type: textblock -#: dos2unix.pod:548 +#: dos2unix.pod:569 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C or C." msgstr "Щоб запустити програму у режимі перетворення Mac, скористайтеся параметром командного рядка C<-c mac> або програмами C та C." #. type: =head1 -#: dos2unix.pod:551 +#: dos2unix.pod:572 msgid "CONVERSION MODES" msgstr "РЕЖИМИ ПЕРЕТВОРЕННЯ" #. type: =item -#: dos2unix.pod:555 +#: dos2unix.pod:576 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:557 -msgid "In mode C only line breaks are converted. This is the default conversion mode." -msgstr "У режимі C виконуватиметься лише перетворення символів розриву рядків. Цей режим є типовим режимом перетворення." +#: dos2unix.pod:578 +msgid "This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling B mode disables B<7bit> and B mode." +msgstr "Це типовий режим перетворення. Цей режим призначено для перетворення файлів у кодуванні ASCII або сумісному з ASCII кодуванні, зокрема UTF-8. Вмикання режиму B вимикає режим B<7bit> і B." #. type: textblock -#: dos2unix.pod:560 -msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." -msgstr "Хоча цей режим і називається режимом ASCII (стандарту 7-бітового кодування), насправді кодування символів у ньому є 8-бітовим. Завжди користуйтеся цим режимом для перетворення файлів у кодуванні UTF-8 (Unicode)." +#: dos2unix.pod:582 +msgid "If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has UTF-16 support type C. See also section UNICODE." +msgstr "Якщо у dos2unix передбачено підтримку UTF-16, файли у кодуванні UTF-16 буде перетворено до поточного кодування символів локалі у системах POSIX та до UTF-8 у Windows. Вмикання режиму B вимикає параметр збереження кодування UTF-16 (C<-u>) і параметр, які надають змогу припускати, що вхідні дані закодовано в UTF-16 (C<-ul> і C<-ub>). Щоб визначити, чи передбачено у dos2unix підтримку UTF-16, введіть команду C. Див. також розділ UNICODE." #. type: =item -#: dos2unix.pod:564 +#: dos2unix.pod:588 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:566 +#: dos2unix.pod:590 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "У цьому режимі усі 8-бітові символи, які не є частиною ASCII, (з номерами від 128 до 255) буде перетворено на відповідні 7-бітові символи." #. type: =item -#: dos2unix.pod:569 +#: dos2unix.pod:593 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:571 +#: dos2unix.pod:595 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Перетворення символів буде виконано з кодування (кодової сторінки) DOS до кодування ISO-8859-1 (Latin-1) у Unix. Символи DOS, які не мають еквівалентів у ISO-8859-1 і перетворення яких неможливе, буде перетворено на символ крапки. Те саме стосується символів ISO-8859-1, які не мають еквівалентів у DOS." #. type: textblock -#: dos2unix.pod:576 +#: dos2unix.pod:600 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "Якщо буде використано лише параметр C<-iso>, програма dos2unix спробує визначити активне кодування. Якщо це виявиться неможливим, dos2unix використає типове кодування CP437, яке здебільшого використовується у США. Щоб примусово визначити кодування, скористайтеся параметром C<-437> (США), C<-850> (західноєвропейські мови), C<-860> (португальська), C<-863> (канадська французька) або C<-865> (скандинавські мови). Використати кодування Windows CP1252 (західноєвропейські мови) можна за допомогою параметра C<-1252>. Для інших кодувань використовуйте поєднання dos2unix з iconv(1). Програма iconv здатна виконувати перетворення даних у доволі широкому спектрі кодувань символів." #. type: textblock -#: dos2unix.pod:585 +#: dos2unix.pod:609 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "Ніколи не користуйтеся перетворенням ISO для текстових файлів у форматі Unicode. Використання подібного перетворення призведе до ушкодження вмісту файлів у кодуванні UTF-8." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:611 msgid "Some examples:" msgstr "Декілька прикладів:" #. type: textblock -#: dos2unix.pod:589 +#: dos2unix.pod:613 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Перетворити дані у типовому кодуванні DOS на дані у кодуванні Latin-1 Unix:" #. type: verbatim -#: dos2unix.pod:591 +#: dos2unix.pod:615 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -1051,12 +1102,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:593 +#: dos2unix.pod:617 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Перетворити дані у кодуванні DOS CP850 на дані у кодуванні Latin-1 Unix:" #. type: verbatim -#: dos2unix.pod:595 +#: dos2unix.pod:619 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -1066,12 +1117,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:597 +#: dos2unix.pod:621 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Перетворити дані у кодуванні CP1252 Windows на дані у кодуванні Latin-1 Unix:" #. type: verbatim -#: dos2unix.pod:599 +#: dos2unix.pod:623 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -1081,12 +1132,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:601 +#: dos2unix.pod:625 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Перетворити дані у кодуванні CP252 Windows на дані у кодуванні UTF-8 Unix (Unicode):" #. type: verbatim -#: dos2unix.pod:603 +#: dos2unix.pod:627 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -1096,12 +1147,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:605 +#: dos2unix.pod:629 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Перетворити дані у кодуванні Latin-1 Unix на дані у типовому кодуванні DOS:" #. type: verbatim -#: dos2unix.pod:607 +#: dos2unix.pod:631 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -1111,12 +1162,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:609 +#: dos2unix.pod:633 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Перетворити дані у кодуванні Latin-1 Unix на дані у кодуванні DOS CP850:" #. type: verbatim -#: dos2unix.pod:611 +#: dos2unix.pod:635 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1126,12 +1177,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:637 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Перетворити дані у кодуванні Latin-1 Unix на дані у кодуванні Windows CP1252:" #. type: verbatim -#: dos2unix.pod:615 +#: dos2unix.pod:639 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1141,12 +1192,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:617 +#: dos2unix.pod:641 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Перетворити дані у кодуванні UTF-8 Unix (Unicode) на дані у кодуванні Windows CP1252:" #. type: verbatim -#: dos2unix.pod:619 +#: dos2unix.pod:643 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1156,142 +1207,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:621 +#: dos2unix.pod:645 msgid "See also L and L." msgstr "Див. також L та L." #. type: =head1 -#: dos2unix.pod:626 +#: dos2unix.pod:650 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:628 +#: dos2unix.pod:652 msgid "Encodings" msgstr "Кодування" #. type: textblock -#: dos2unix.pod:630 +#: dos2unix.pod:654 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Існує декілька різних кодувань Unicode. У Unix та Linux у файлах Unicode здебільшого використовується кодування UTF-8. У Windows для текстових файлів Unicode може бути використано кодування UTF-8, UTF-16 або UTF-16 зі зворотним порядком байтів. Втім, здебільшого, використовується формат UTF-16." #. type: =head2 -#: dos2unix.pod:635 +#: dos2unix.pod:659 msgid "Conversion" msgstr "Перетворення" #. type: textblock -#: dos2unix.pod:637 -msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." -msgstr "У текстових файлах Unicode, як і у звичайних текстових файлах, може бути використано розриви рядків DOS, Unix або Mac." +#: dos2unix.pod:661 +msgid "Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files." +msgstr "У текстових файлах Unicode, як і у текстових файлах ASCII, може бути використано розриви рядків DOS, Unix або Mac." #. type: textblock -#: dos2unix.pod:640 +#: dos2unix.pod:664 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Усі версії dos2unix та unix2dos здатні виконувати перетворення у кодуванні UTF-8, оскільки UTF-8 було розроблено так, що зворотну сумісність з ASCII збережено." #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:667 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C." msgstr "Програми dos2unix та unix2dos, зібрані з підтримкою Unicode UTF-16, можуть читати текстові файли у кодуванні UTF-16 з прямим та зворотним порядком байтів. Щоб дізнатися про те, чи було dos2unix зібрано з підтримкою UTF-16, віддайте команду C." #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:671 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "У Unix/Linux файли у кодуванні UTF-16 перетворюються на файли у кодуванні локалі. Для визначення поточного кодування символів локалі скористайтеся командою locale(1). Якщо перетворення виявиться неможливим, програма повідомить про помилку перетворення і пропустить відповідний файл." #. type: textblock -#: dos2unix.pod:652 +#: dos2unix.pod:676 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "У Windows файли UTF-16 типово буде перетворено на файли UTF-8. Обидва типи систем, Windows та Unix/Linux, мають непогані можливості з підтримки файлів у форматуванні UTF-8." #. type: textblock -#: dos2unix.pod:655 +#: dos2unix.pod:679 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "Кодування UTF-16 та UTF-8 є повністю сумісними. Під час перетворення не буде втрачено жодної інформації. Якщо під час перетворення даних у кодуванні UTF-16 на дані у кодуванні UTF-8 трапиться помилка, наприклад, якщо у вхідному файлі UTF-16 міститиметься якась помилка, файл буде пропущено." #. type: textblock -#: dos2unix.pod:659 +#: dos2unix.pod:683 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "Якщо використано параметр C<-u>, файл результатів буде записано у тому самому кодуванні UTF-16, що і початковий файл. Використання параметра Option C<-u> запобігає перетворенню даних у кодування UTF-8." #. type: textblock -#: dos2unix.pod:662 +#: dos2unix.pod:686 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "У dos2unix та unix2dos не передбачено параметра для перетворення даних у кодуванні UTF-8 на дані у кодуванні UTF-16." #. type: textblock -#: dos2unix.pod:664 +#: dos2unix.pod:688 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "Режим перетворення ISO та 7-бітовий режим не працюють для файлів UTF-16." #. type: =head2 -#: dos2unix.pod:666 +#: dos2unix.pod:690 msgid "Byte Order Mark" msgstr "Позначка порядку байтів" #. type: textblock -#: dos2unix.pod:668 -msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." -msgstr "У Windows до текстових файлів у кодуванні Unicode типово дописується позначка порядку байтів (BOM), оскільки багато програм Windows (зокрема Notepad) додають таку позначку автоматично. Див. також L." +#: dos2unix.pod:692 +msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." +msgstr "У Windows до текстових файлів у кодуванні Unicode типово дописується позначка порядку байтів (BOM), оскільки багато програм Windows (зокрема Notepad) додають таку позначку автоматично. Див. також L." #. type: textblock -#: dos2unix.pod:672 +#: dos2unix.pod:696 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "У Unix файли у кодуванні Unicode типово не містять позначки порядку байтів. Вважається, що кодуванням текстових файлів є те кодування, яке визначається поточною локаллю." #. type: textblock -#: dos2unix.pod:675 +#: dos2unix.pod:699 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "Програма dos2unix може визначити, чи є кодуванням файла UTF-16, лише якщо у файлі міститься позначка порядку байтів. Якщо у файлі, де використано кодування UTF-16, немає такої позначки, dos2unix вважатиме такий файл двійковим (бінарним)." #. type: textblock -#: dos2unix.pod:679 +#: dos2unix.pod:703 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Для перетворення файлів UTF-16 без позначки порядку байтів скористайтеся параметром C<-ul> або C<-ub>." #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:705 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "Типово dos2unix не записує до файлів результатів перетворення позначки порядку байтів (BOM). Якщо використано параметр C<-b>, dos2unix запише до файла результатів BOM, якщо BOM була у файлі початкових даних." #. type: textblock -#: dos2unix.pod:684 +#: dos2unix.pod:708 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "Типово unix2dos записує позначку порядку байтів (BOM) до файла результатів, якщо BOM є у початковому файлі. Скористайтеся параметром C<-r>, щоб вилучити BOM." #. type: textblock -#: dos2unix.pod:687 +#: dos2unix.pod:711 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "Dos2unix та unix2dos завжди записують до файла результатів позначку порядку байтів (BOM), якщо використано параметр C<-m>." #. type: =head2 -#: dos2unix.pod:689 +#: dos2unix.pod:713 msgid "Unicode file names on Windows" msgstr "Назви файлів у Unicode у Windows" #. type: textblock -#: dos2unix.pod:691 +#: dos2unix.pod:715 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C." msgstr "У dos2unix передбачено підтримку читання і запису назв файлів Unicode у командному рядку Windows. Це означає, що dos2unix може відкривати файли, у назвах яких є символи, які не є частиною типової системної кодової сторінки ANSI. Щоб визначити, чи зібрано dos2unix для Windows з підтримкою назв файлів у кодуванні Unicode, скористайтеся командою C." #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:721 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "Із показом назв файлів у кодуванні Unicode у консолі Windows пов’язано декілька проблем. Див. параметр C<-D>, C<--display-enc>. Назви файлів може бути некоректно показано у консолі, але запис цих назв відбуватиметься належним чином." #. type: =head2 -#: dos2unix.pod:701 +#: dos2unix.pod:725 msgid "Unicode examples" msgstr "Приклади для Unicode" #. type: textblock -#: dos2unix.pod:703 +#: dos2unix.pod:727 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Перетворити дані з Windows UTF-16 (з позначкою порядку байтів (BOM)) у формат Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:705 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1301,12 +1352,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:731 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Перетворити дані у форматі Windows UTF-16LE (без BOM) на дані у форматі UTF-8 Unix:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:733 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1316,12 +1367,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:735 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Перетворити дані у кодуванні UTF-8 Unix на дані у кодуванні Windows UTF-8 без BOM:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:737 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1331,12 +1382,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:739 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Перетворити дані у кодуванні UTF-8 Unix на дані у кодуванні Windows UTF-16:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:741 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1346,47 +1397,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:719 +#: dos2unix.pod:743 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:721 -msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." -msgstr "GB18030 є китайським урядовим стандартом. Підтримка обов’язкової підмножини стандарту GB18030 є неодмінною вимогою до будь-яких програмних продуктів, які продаються у Китаї. Див. також L." +#: dos2unix.pod:745 +msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." +msgstr "GB18030 є китайським урядовим стандартом. Підтримка обов’язкової підмножини стандарту GB18030 є неодмінною вимогою до будь-яких програмних продуктів, які продаються у Китаї. Див. також L." #. type: textblock -#: dos2unix.pod:725 +#: dos2unix.pod:749 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "Кодування GB18030 є повністю сумісним із Unicode. Його можна розглядати як формат перетворення unicode. Подібно до UTF-8, GB18030 є сумісним із ASCII. GB18030 також є сумісним із кодовою сторінкою Windows 936, яку ще називають GBK." #. type: textblock -#: dos2unix.pod:729 +#: dos2unix.pod:753 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C to get the list of supported locales." msgstr "У Unix/Linux файли UTF-16 буде перетворено до кодування GB18030, якщо кодуванням локалі є GB18030. Зауважте, що це спрацює, лише якщо підтримку локалі передбачено у системі. Щоб отримати список підтримуваних локалей, скористайтеся командою C." #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:757 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "У Windows для перетворення файлів UTF-16 на файли GB18030 слід вказати параметр C<-gb>." #. type: textblock -#: dos2unix.pod:735 +#: dos2unix.pod:759 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "У файлах у кодуванні GB18030 може міститися позначка порядку байтів, так само, як у файлах у кодуванні Unicode." #. type: =head1 -#: dos2unix.pod:737 +#: dos2unix.pod:761 msgid "EXAMPLES" msgstr "ПРИКЛАДИ" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:763 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Прочитати вхідні дані зі стандартного джерела (stdin) і записати результат до стандартного виведення (stdout):" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:765 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1398,12 +1449,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:744 +#: dos2unix.pod:768 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "Перетворити дані у a.txt і замістити цей файл. Перетворити дані у b.txt і замістити цей файл:" #. type: verbatim -#: dos2unix.pod:746 +#: dos2unix.pod:770 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1415,12 +1466,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:749 +#: dos2unix.pod:773 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "Перетворити дані у a.txt і замістити файл у режимі перетворення ascii:" #. type: verbatim -#: dos2unix.pod:751 +#: dos2unix.pod:775 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1430,12 +1481,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:753 +#: dos2unix.pod:777 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "Перетворити дані у a.txt і замістити файл у режимі перетворення ascii. Перетворити дані у b.txt і замістити цей файл у режимі 7-бітового перетворення:" #. type: verbatim -#: dos2unix.pod:756 +#: dos2unix.pod:780 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1449,12 +1500,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:760 +#: dos2unix.pod:784 msgid "Convert a.txt from Mac to Unix format:" msgstr "Перетворити файл a.txt з формату Mac на формат Unix:" #. type: verbatim -#: dos2unix.pod:762 +#: dos2unix.pod:786 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1466,12 +1517,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:765 +#: dos2unix.pod:789 msgid "Convert a.txt from Unix to Mac format:" msgstr "Перетворити файл a.txt з формату Unix на формат Mac:" #. type: verbatim -#: dos2unix.pod:767 +#: dos2unix.pod:791 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1483,12 +1534,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:770 +#: dos2unix.pod:794 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "Перетворити дані у a.txt, замістити цей файл і зберегти часову позначку початкового файла:" #. type: verbatim -#: dos2unix.pod:772 +#: dos2unix.pod:796 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1500,12 +1551,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:775 +#: dos2unix.pod:799 msgid "Convert a.txt and write to e.txt:" msgstr "Перетворити дані у файлі a.txt і записати результати до файла e.txt:" #. type: verbatim -#: dos2unix.pod:777 +#: dos2unix.pod:801 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1515,12 +1566,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:779 +#: dos2unix.pod:803 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "Перетворити дані у файлі a.txt і записати результати до файла e.txt. Скопіювати часову позначку файла a.txt для файла e.txt:" #. type: verbatim -#: dos2unix.pod:781 +#: dos2unix.pod:805 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1530,12 +1581,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:783 +#: dos2unix.pod:807 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "Перетворити дані у a.txt і замістити цей файл. Перетворити дані у b.txt і записати результат до e.txt:" #. type: verbatim -#: dos2unix.pod:785 +#: dos2unix.pod:809 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1547,12 +1598,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:788 +#: dos2unix.pod:812 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "Перетворити дані у c.txt і записати результати до e.txt. Перетворити дані у a.txt і замістити ними цей файл. Перетворити дані у b.txt і замістити ними цей файл. Перетворити дані у d.txt і записати результати до f.txt:" #. type: verbatim -#: dos2unix.pod:791 +#: dos2unix.pod:815 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1562,17 +1613,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:793 +#: dos2unix.pod:817 msgid "RECURSIVE CONVERSION" msgstr "РЕКУРСИВНЕ ПЕРЕТВОРЕННЯ" #. type: textblock -#: dos2unix.pod:795 +#: dos2unix.pod:819 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "У оболонці UNIX можна скористатися командами find(1) і xargs(1) для запуску dos2unix рекурсивно для усіх текстових файлів у ієрархії каталогів. Наприклад, щоб виконати перетворення усіх файлів .txt у структурі підкаталогів поточного каталогу, віддайте таку команду:" #. type: verbatim -#: dos2unix.pod:799 +#: dos2unix.pod:823 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1582,12 +1633,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:801 +#: dos2unix.pod:825 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "Параметр find(1) C<-print0> і відповідний параметр xargs(1) C<-0> потрібні, якщо у назва файлів є пробіли або лапки. Інакше, ці параметри можна пропустити. Іншим варіантом дій є використання find(1) з параметром C<-exec>:" #. type: verbatim -#: dos2unix.pod:805 +#: dos2unix.pod:829 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1597,12 +1648,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:807 +#: dos2unix.pod:831 msgid "In a Windows Command Prompt the following command can be used:" msgstr "У командному рядку Windows можна скористатися такою командою:" #. type: verbatim -#: dos2unix.pod:809 +#: dos2unix.pod:833 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1612,12 +1663,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:811 +#: dos2unix.pod:835 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "Користувачі PowerShell можуть скористатися такою командою у Windows PowerShell:" #. type: verbatim -#: dos2unix.pod:813 +#: dos2unix.pod:837 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1627,22 +1678,22 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:816 +#: dos2unix.pod:840 msgid "LOCALIZATION" msgstr "ЛОКАЛІЗАЦІЯ" #. type: =item -#: dos2unix.pod:820 +#: dos2unix.pod:844 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:822 +#: dos2unix.pod:846 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "Основна мова визначається за допомогою змінної середовища LANG. Значення змінної LANG складається з декількох частин. Перша частина записується малими літерами і визначає код мови. Друга частина є необов’язковою, визначає код країни і записується прописними літерами, відокремлюється від першої частини символом підкреслювання. Передбачено також необов’язкову третю частину: кодування. Ця частина відокремлюється від другої частини крапкою. Ось декілька прикладів для командних оболонок стандартного типу POSIX:" #. type: verbatim -#: dos2unix.pod:829 +#: dos2unix.pod:853 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1664,47 +1715,47 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:837 -msgid "For a complete list of language and country codes see the gettext manual: L" -msgstr "Повний список мов та кодів країн наведено у підручнику з gettext: L" +#: dos2unix.pod:861 +msgid "For a complete list of language and country codes see the gettext manual: L" +msgstr "Повний список мов та кодів країн наведено у підручнику з gettext: L" #. type: textblock -#: dos2unix.pod:840 +#: dos2unix.pod:864 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "У системах Unix для отримання даних щодо локалі можна скористатися командою locale(1)." #. type: =item -#: dos2unix.pod:843 +#: dos2unix.pod:867 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:845 -msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" -msgstr "За допомогою змінної середовища LANGUAGE ви можете вказати список пріоритеності мов. Записи у списку слід відокремлювати двокрапками. Програма dos2unix надає перевагу LANGUAGE над LANG. Наприклад, перша голландська, далі німецька: C. Спочатку вам слід увімкнути локалізацію, встановивши для змінної LANG (або LC_ALL) значення, відмінне від «C». Далі ви зможете використовувати список пріоритетності мов за допомогою змінної LANGUAGE. Додаткові відомості можна знайти у підручнику з gettext: L" +#: dos2unix.pod:869 +msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" +msgstr "За допомогою змінної середовища LANGUAGE ви можете вказати список пріоритетності мов. Записи у списку слід відокремлювати двокрапками. Програма dos2unix надає перевагу LANGUAGE над LANG. Наприклад, перша голландська, далі німецька: C. Спочатку вам слід увімкнути локалізацію, встановивши для змінної LANG (або LC_ALL) значення, відмінне від «C». Далі ви зможете використовувати список пріоритетності мов за допомогою змінної LANGUAGE. Додаткові відомості можна знайти у підручнику з gettext: L" #. type: textblock -#: dos2unix.pod:853 +#: dos2unix.pod:877 msgid "If you select a language which is not available you will get the standard English messages." msgstr "Якщо вами буде вибрано мову, перекладу якою немає, буде показано стандартні повідомлення англійською мовою." #. type: =item -#: dos2unix.pod:857 +#: dos2unix.pod:881 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:859 +#: dos2unix.pod:883 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C. Option B<--version> will display the LOCALEDIR that is used." msgstr "Змінну LOCALEDIR, встановлену під час збирання програми, можна змінити за допомогою змінної середовища DOS2UNIX_LOCALEDIR. LOCALEDIR використовується для пошуку файлів перекладів. Типовим значенням у системах GNU є C. Переглянути поточне значення змінної LOCALEDIR можна переглянути за допомогою параметра B<--version>." #. type: textblock -#: dos2unix.pod:864 +#: dos2unix.pod:888 msgid "Example (POSIX shell):" msgstr "Приклад (командна оболонка POSIX):" #. type: verbatim -#: dos2unix.pod:866 +#: dos2unix.pod:890 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1714,75 +1765,84 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:871 +#: dos2unix.pod:895 msgid "RETURN VALUE" msgstr "ПОВЕРНУТЕ ЗНАЧЕННЯ" #. type: textblock -#: dos2unix.pod:873 +#: dos2unix.pod:897 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "Якщо завдання вдасться успішно виконати, програма поверне нульовий код виходу. Якщо станеться системна помилка, буде повернуто код цієї помилки. Якщо станеться якась інша помилка, буде повернуто код 1." #. type: textblock -#: dos2unix.pod:876 +#: dos2unix.pod:900 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "У режимі без повідомлень повернутим значенням завжди буде нуль, якщо вказано правильні параметри командного рядка." #. type: =head1 -#: dos2unix.pod:879 +#: dos2unix.pod:903 msgid "STANDARDS" msgstr "СТАНДАРТИ" #. type: textblock -#: dos2unix.pod:881 -msgid "L" -msgstr "L" +#: dos2unix.pod:905 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:883 -msgid "L" -msgstr "L" +#: dos2unix.pod:907 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:885 -msgid "L" -msgstr "L" +#: dos2unix.pod:909 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:887 -msgid "L" -msgstr "L" +#: dos2unix.pod:911 +msgid "L" +msgstr "L" #. type: =head1 -#: dos2unix.pod:889 +#: dos2unix.pod:913 msgid "AUTHORS" msgstr "АВТОРИ" #. type: textblock -#: dos2unix.pod:891 +#: dos2unix.pod:915 msgid "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer)" msgstr "Benjamin Lin - , Bernd Johannes Wuebben (режим mac2unix) - , Christian Wurll (додатковий новий рядок) - , Erwin Waterlander - (супровідник)" #. type: textblock -#: dos2unix.pod:896 -msgid "Project page: L" -msgstr "Сторінка проекту: L" +#: dos2unix.pod:920 +msgid "Project page: L" +msgstr "Сторінка проєкту: L" #. type: textblock -#: dos2unix.pod:898 -msgid "SourceForge page: L" -msgstr "Сторінка на SourceForge: L" +#: dos2unix.pod:922 +msgid "SourceForge page: L" +msgstr "Сторінка на SourceForge: L" #. type: =head1 -#: dos2unix.pod:900 +#: dos2unix.pod:924 msgid "SEE ALSO" msgstr "ТАКОЖ ПЕРЕГЛЯНЬТЕ" #. type: textblock -#: dos2unix.pod:902 +#: dos2unix.pod:926 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" +#~ msgid "Convert only line breaks. This is the default conversion mode." +#~ msgstr "Виконати лише перетворення символів розриву рядків. Типовий режим перетворення." + +#~ msgid "In mode C only line breaks are converted. This is the default conversion mode." +#~ msgstr "У режимі C виконуватиметься лише перетворення символів розриву рядків. Цей режим є типовим режимом перетворення." + +#~ msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." +#~ msgstr "Хоча цей режим і називається режимом ASCII (стандарту 7-бітового кодування), насправді кодування символів у ньому є 8-бітовим. Завжди користуйтеся цим режимом для перетворення файлів у кодуванні UTF-8 (Unicode)." + #~ msgid "" #~ " find -name '*.txt' | xargs dos2unix -ic\n" #~ "\n" diff --git a/dos2unix/po-man/zh_CN.po b/dos2unix/po-man/zh_CN.po index 4a52cfd..25560bd 100644 --- a/dos2unix/po-man/zh_CN.po +++ b/dos2unix/po-man/zh_CN.po @@ -2,20 +2,21 @@ # Copyright (C) 2014 Erwin Waterlander (msgids) # This file is distributed under the same license as the dos2unix package. # Tianze Wang , 2015, 2016. +# Boyuan Yang <073plan@gmail.com>, 2023. msgid "" msgstr "" -"Project-Id-Version: dos2unix-man-7.5.0-beta5\n" -"POT-Creation-Date: 2023-04-23 10:34+0200\n" -"PO-Revision-Date: 2023-06-02 15:43+0800\n" -"Last-Translator: Tianze Wang \n" +"Project-Id-Version: dos2unix-man-7.5.2-beta3\n" +"POT-Creation-Date: 2023-11-27 22:01+0100\n" +"PO-Revision-Date: 2023-11-29 11:06-0500\n" +"Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.2.1\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" +"X-Generator: Poedit 3.4.1\n" #. type: =head1 #: dos2unix.pod:52 @@ -146,8 +147,8 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:121 -msgid "Convert only line breaks. This is the default conversion mode." -msgstr "只转换断行符。这是默认的转换模式。" +msgid "Default conversion mode. See also section CONVERSION MODES." +msgstr "默认转换模式。。参见 CONVERSION MODES 一节。" #. type: =item #: dos2unix.pod:123 @@ -400,7 +401,7 @@ msgid "The following information is printed, in this order: number of DOS line b msgstr "将会显示下列信息（按顺序）：DOS断行符的数量、Unix断行符的数量、Mac断行符的数量、是否有BOM、文本/二进制、文件名。" #. type: textblock -#: dos2unix.pod:274 +#: dos2unix.pod:274 dos2unix.pod:290 msgid "Example output:" msgstr "输出示例：" @@ -435,116 +436,152 @@ msgstr "注意，二进制文件有时会被误判为文本文件。参见选项 #. type: textblock #: dos2unix.pod:287 +msgid "If in addition option C<-e> or C<--add-eol> is used also the type of the line break of the last line is printed, or C if there is none." +msgstr "如果额外使用了 C<-e> 或 C<--add-eol> 选项，则最后一行的断行符类型也会被显示，或者在缺失的情况下显示 C。" + +#. type: verbatim +#: dos2unix.pod:292 +#, no-wrap +msgid "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" +msgstr "" +" 6 0 0 no_bom text dos dos.txt\n" +" 0 6 0 no_bom text unix unix.txt\n" +" 0 0 6 no_bom text mac mac.txt\n" +" 1 0 0 no_bom text noeol noeol_dos.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:297 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "可以为输出设置额外的标志（一个或多个）。" #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:302 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:304 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "使用零字符（\"\\0\"）而非换行符来分割文件信息行。用于在指定了 c 选项的情况下，正确解析含有空格或引号的文件名。请结合 xargs(1) 的选项 C<-0> 或 C<--null> 来使用。" #. type: =item -#: dos2unix.pod:299 +#: dos2unix.pod:309 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:301 +#: dos2unix.pod:311 msgid "Print number of DOS line breaks." msgstr "显示DOS断行符的数量。" #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:313 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:315 msgid "Print number of Unix line breaks." msgstr "显示Unix断行符的数量。" #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:317 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:319 msgid "Print number of Mac line breaks." msgstr "显示Mac断行符的数量。" #. type: =item -#: dos2unix.pod:311 +#: dos2unix.pod:321 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:323 msgid "Print the byte order mark." msgstr "显示BOM状况。" #. type: =item -#: dos2unix.pod:315 +#: dos2unix.pod:325 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:317 +#: dos2unix.pod:327 msgid "Print if file is text or binary." msgstr "显示文件为文本或二进制。" #. type: =item -#: dos2unix.pod:319 +#: dos2unix.pod:329 +msgid "B" +msgstr "B" + +#. type: textblock +#: dos2unix.pod:331 +msgid "Print the type of the line break of the last line, or C if there is none." +msgstr "显示最后一行的断行符类型，如果不存在则显示 C。" + +#. type: =item +#: dos2unix.pod:333 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:321 +#: dos2unix.pod:335 msgid "Print only the files that would be converted." msgstr "只显示将会被转换的文件。" #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:337 msgid "With the C flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "若设置了 C标志，dos2unix将只显示含有DOS断行符的文件，unix2dos将只显示含有Unix断行符的文件。" +#. type: textblock +#: dos2unix.pod:340 +msgid "If in addition option C<-e> or C<--add-eol> is used also the files that lack a line break on the last line will be printed." +msgstr "如果额外使用了 C<-e> 或 C<--add-eol> 选项，则最后一行缺失断行符的文件将被显示。" + #. type: =item -#: dos2unix.pod:326 +#: dos2unix.pod:343 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:345 msgid "Print a header." msgstr "显示头部。" #. type: =item -#: dos2unix.pod:330 +#: dos2unix.pod:347 msgid "B

" msgstr "B

" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:349 msgid "Show file names without path." msgstr "显示不含路径的文件名。" #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:353 msgid "Examples:" msgstr "示例：" #. type: textblock -#: dos2unix.pod:338 +#: dos2unix.pod:355 msgid "Show information for all *.txt files:" msgstr "显示所有 *.txt 文件的信息：" #. type: verbatim -#: dos2unix.pod:340 +#: dos2unix.pod:357 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -554,12 +591,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:342 +#: dos2unix.pod:359 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "只显示DOS断行符和Unix断行符的数量：" #. type: verbatim -#: dos2unix.pod:344 +#: dos2unix.pod:361 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -569,12 +606,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:346 +#: dos2unix.pod:363 msgid "Show only the byte order mark:" msgstr "只显示BOM状况：" #. type: verbatim -#: dos2unix.pod:348 +#: dos2unix.pod:365 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -584,12 +621,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:350 +#: dos2unix.pod:367 msgid "List the files that have DOS line breaks:" msgstr "列出含有DOS断行符的文件：" #. type: verbatim -#: dos2unix.pod:352 +#: dos2unix.pod:369 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -599,12 +636,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:354 +#: dos2unix.pod:371 msgid "List the files that have Unix line breaks:" msgstr "列出含有Unix断行符的文件：" #. type: verbatim -#: dos2unix.pod:356 +#: dos2unix.pod:373 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -614,12 +651,27 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:358 +#: dos2unix.pod:375 +msgid "List the files that have DOS line breaks or lack a line break on the last line:" +msgstr "列出含有DOS断行符或最后一行缺少断行符的文件：" + +#. type: verbatim +#: dos2unix.pod:377 +#, no-wrap +msgid "" +" dos2unix -e -ic *.txt\n" +"\n" +msgstr "" +" dos2unix -e -ic *.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:379 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "只转换含有DOS断行符的文件，保持其他文件不变：" #. type: verbatim -#: dos2unix.pod:360 +#: dos2unix.pod:381 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -629,12 +681,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:362 +#: dos2unix.pod:383 msgid "Find text files that have DOS line breaks:" msgstr "查找含有DOS断行符的文本文件：" #. type: verbatim -#: dos2unix.pod:364 +#: dos2unix.pod:385 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -644,122 +696,122 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:366 +#: dos2unix.pod:387 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:368 +#: dos2unix.pod:389 msgid "Keep the date stamp of output file same as input file." msgstr "将输入文件的时间戳应用到输出文件。" #. type: =item -#: dos2unix.pod:370 +#: dos2unix.pod:391 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:372 +#: dos2unix.pod:393 msgid "Display program's license." msgstr "显示程序许可证。" #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:395 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:397 msgid "Add additional newline." msgstr "添加额外的新行。" #. type: textblock -#: dos2unix.pod:378 +#: dos2unix.pod:399 msgid "B: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B：只有DOS断行符会被转换为两个Unix断行符。在Mac模式下，只有Mac断行符会被转换为Unix断行符。" #. type: textblock -#: dos2unix.pod:382 +#: dos2unix.pod:403 msgid "B: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B：只有Unix断行符会被转换为两个DOS断行符。在Mac模式下，Unix断行符会被转换为两个Mac断行符。" #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:406 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:408 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "将字节序标记（BOM）写入到输出文件。默认情况下将写入UTF-8 BOM。" #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:411 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "当输入文件为UTF-16格式，并且使用了 C<-u>选项，将写入UTF-16 BOM。" #. type: textblock -#: dos2unix.pod:393 +#: dos2unix.pod:414 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "当输出文件不是UTF-8、UTF-16或GB18030格式时，请不要使用此选项。参加 UNICODE 一节。" #. type: =item -#: dos2unix.pod:397 +#: dos2unix.pod:418 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newline 输入文件 输出文件 ...>" #. type: textblock -#: dos2unix.pod:399 +#: dos2unix.pod:420 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I be used or you I lose your files." msgstr "新文件模式。转换输入文件并写入到输出文件。文件名必须成对给出，并且 I<不能> 使用通配符，否则你 I<将会>丢失文件。" #. type: textblock -#: dos2unix.pod:403 +#: dos2unix.pod:424 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "使用新文件（配对）模式转换时，命令执行者必须为文件的所有者。新文件的读/写权限将由源文件的权限减去命令执行者的 umask(1) 得到。" #. type: =item -#: dos2unix.pod:408 +#: dos2unix.pod:429 msgid "B<--no-allow-chown>" msgstr "B<--no-allow-chown>" #. type: textblock -#: dos2unix.pod:410 +#: dos2unix.pod:431 msgid "Don't allow file ownership change in old file mode (default)." msgstr "在旧文件模式下，不允许修改文件的所有者（默认选项）。" #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:433 msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." msgstr "当原始文件的属主/属组无法保持不变时，停止格式转换。另请参见C<-o> 和 C<-n>选项。仅当 dos2unix 支持保护文件的属主/属组时才能使用该选项。" #. type: =item -#: dos2unix.pod:417 +#: dos2unix.pod:438 msgid "B<--no-add-eol>" msgstr "B<--no-add-eol>" #. type: textblock -#: dos2unix.pod:419 +#: dos2unix.pod:440 msgid "Do not add a line break to the last line if there isn't one." msgstr "即使文件末尾缺少换行符，也不要追加换行符。" #. type: =item -#: dos2unix.pod:421 +#: dos2unix.pod:442 msgid "B<-O, --to-stdout>" msgstr "B<-O, --to-stdout>" #. type: textblock -#: dos2unix.pod:423 +#: dos2unix.pod:444 msgid "Write to standard output, like a Unix filter. Use option C<-o> to go back to old file (in-place) mode." msgstr "将结果重定向至标准输出（类似Unix过滤器）。可以使用选项 C<-o> 来切换回旧文件（原位修改）模式。" #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:447 msgid "Combined with option C<-e> files can be properly concatenated. No merged last and first lines, and no Unicode byte order marks in the middle of the concatenated file. Example:" msgstr "与选项 C<-e>一起使用时，可以确保拼接文件时上一个文件的最后一行不会错误地与下一个文件的第一行合并，且不会受到Unicode字节序记号的干扰。例如：" #. type: verbatim -#: dos2unix.pod:430 +#: dos2unix.pod:451 #, no-wrap msgid "" " dos2unix -e -O file1.txt file2.txt > output.txt\n" @@ -769,32 +821,32 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:432 +#: dos2unix.pod:453 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile 文件 ...>" #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:455 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "旧文件模式。转换并将输出覆盖到源文件。程序默认使用此模式，允许使用通配符。" #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:458 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "在旧文件（替换）模式下，被转换的文件的所有者、组和读/写权限保持不变。当文件被其他具有写权限的用户（如root）转换时，情况也是如此。如果无法保持这些值不变，转换将会终止。改变源文件的所有者可能造成其无法读取该文件，而改变组则可能带来安全隐患，使文件被不法分子读取。只有Unix才支持转换时保留所有者、组和读/写权限。" #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:467 msgid "To check if dos2unix has support for preserving the user and group ownership of files type C." msgstr "若要查看 dos2unix 是否支持保护文件的所有者，请输入C。" #. type: textblock -#: dos2unix.pod:449 +#: dos2unix.pod:470 msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" msgstr "dos2unix 在转换格式时会生成一个临时文件。如果在转换时出错，它会删除临时文件，从而保证原始文件不被更改；如果转换成功，将用临时文件替换原始文件。在这一过程中，如果 dos2unix 无法将临时文件的所有者设置为原始文件的所有者，那么新生成的文件也无法保留原始文件的属主/属组属性（即便您对原始文件有写入权限）。在这种情况下，可以使用C<--allow-chown>选项来继续进行转换：" #. type: verbatim -#: dos2unix.pod:458 +#: dos2unix.pod:479 #, no-wrap msgid "" " dos2unix --allow-chown foo.txt\n" @@ -804,12 +856,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:460 +#: dos2unix.pod:481 msgid "Another option is to use new file mode:" msgstr "或者在新文件模式下：" #. type: verbatim -#: dos2unix.pod:462 +#: dos2unix.pod:483 #, no-wrap msgid "" " dos2unix -n foo.txt foo.txt\n" @@ -819,229 +871,229 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:485 msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." msgstr "使用C<--allow-chown>选项的好处在于：您可以使用通配符来操作文件，同时尽可能保持文件的所有者不变。" #. type: =item -#: dos2unix.pod:467 +#: dos2unix.pod:488 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:469 +#: dos2unix.pod:490 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "安静模式。不显示任何警告或信息。返回值为0，除非命令行选项有误。" #. type: =item -#: dos2unix.pod:472 +#: dos2unix.pod:493 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:495 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "移除字节序标记（BOM），不写入BOM到输出文件。这是转换到Unix断行符时的默认行为。参见选项 C<-b>。" #. type: =item -#: dos2unix.pod:478 +#: dos2unix.pod:499 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:501 msgid "Skip binary files (default)." msgstr "跳过二进制文件（默认）。" #. type: textblock -#: dos2unix.pod:482 +#: dos2unix.pod:503 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "跳过二进制文件是为了避免可能的错误。请注意，对二进制文件的探测并不能做到100%准确。程序通过扫描二进制文件所特有的标记来将其与文本文件区分开来，但有的二进制文件可能只包含普通的文本字符，这样的文件就会被误判为文本文件。" #. type: =item -#: dos2unix.pod:488 +#: dos2unix.pod:509 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:490 +#: dos2unix.pod:511 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "保留输入文件的UTF-16编码。输出文件也使用UTF-16编码和相同的尾序。这将阻止转换到UTF-8。相应也会写入UTF-16 BOM。可以用 C<-ascii>选项来禁止。" #. type: =item -#: dos2unix.pod:495 +#: dos2unix.pod:516 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:497 +#: dos2unix.pod:518 msgid "Assume that the input file format is UTF-16LE." msgstr "假定输入文件格式为UTF-16LE。" #. type: textblock -#: dos2unix.pod:499 +#: dos2unix.pod:520 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "输入文件中有BOM时，将会覆盖此选项。" #. type: textblock -#: dos2unix.pod:502 +#: dos2unix.pod:523 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "如果你做了错误的假设（输入文件不为UTF-16LE格式），并且转换成功，你将会得到一个错误的UTF-8格式的文件。你可以用 iconv(1) 来撤销转换，将其从UTF-8转换回UTF-16LE。这样做可以恢复源文件。" #. type: textblock -#: dos2unix.pod:507 +#: dos2unix.pod:528 msgid "The assumption of UTF-16LE works as a I. By switching to the default I mode the UTF-16LE assumption is turned off." msgstr "对UTF-16LE的假定将根据 l<转换模式> 来工作。若改变了默认的 l 模式，则这一假定将会被关闭。" #. type: =item -#: dos2unix.pod:510 +#: dos2unix.pod:531 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:512 +#: dos2unix.pod:533 msgid "Assume that the input file format is UTF-16BE." msgstr "假定输入文件格式为UTF-16BE。" #. type: textblock -#: dos2unix.pod:514 +#: dos2unix.pod:535 msgid "This option works the same as option C<-ul>." msgstr "这一选项与 C<-ul> 类似。" #. type: =item -#: dos2unix.pod:516 +#: dos2unix.pod:537 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:518 +#: dos2unix.pod:539 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "显示更多信息。将会显示有关BOM和转换统计的额外信息。" #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:542 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:523 +#: dos2unix.pod:544 msgid "Follow symbolic links and convert the targets." msgstr "追踪符号链接并转换其目标。" #. type: =item -#: dos2unix.pod:525 +#: dos2unix.pod:546 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:527 +#: dos2unix.pod:548 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "将符号链接的目标替换为转换后的文件（原来的目标文件保持不变）。" #. type: =item -#: dos2unix.pod:530 +#: dos2unix.pod:551 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:532 +#: dos2unix.pod:553 msgid "Keep symbolic links and targets unchanged (default)." msgstr "保持符号链接和其目标文件不变（默认）。" #. type: =item -#: dos2unix.pod:534 +#: dos2unix.pod:555 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:536 +#: dos2unix.pod:557 msgid "Display version information and exit." msgstr "显示版本信息，然后退出。" #. type: =head1 -#: dos2unix.pod:540 +#: dos2unix.pod:561 msgid "MAC MODE" msgstr "Mac模式" #. type: textblock -#: dos2unix.pod:542 -msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." -msgstr "普通模式下，断行符将被转换为DOS格式，或相反。Mac格式的断行符将不会被转换。" +#: dos2unix.pod:563 +msgid "By default line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." +msgstr "默认情况下断行符将从DOS格式转换为Unix格式，或相反。Mac格式的断行符将不会被转换。" #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:566 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "Mac模式下，Mac断行符将被转换为Unix格式，或相反。DOS断行符将不会被转换。" #. type: textblock -#: dos2unix.pod:548 +#: dos2unix.pod:569 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C or C." msgstr "若要以Mac模式运行，请使用命令行选项 C<-c mac>，或使用命令 C 或 C。" #. type: =head1 -#: dos2unix.pod:551 +#: dos2unix.pod:572 msgid "CONVERSION MODES" msgstr "转换模式" #. type: =item -#: dos2unix.pod:555 +#: dos2unix.pod:576 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:557 -msgid "In mode C only line breaks are converted. This is the default conversion mode." -msgstr "在 C 模式下，只转换断行符。 这是默认的转换模式。" +#: dos2unix.pod:578 +msgid "This is the default conversion mode. This mode is for converting ASCII and ASCII-compatible encoded files, like UTF-8. Enabling B mode disables B<7bit> and B mode." +msgstr "这是默认转换模式。该模式用于转换ASCII和ASCII兼容编码的文件，例如UTF-8。启用B模式会禁用B<7bit>和B模式。" #. type: textblock -#: dos2unix.pod:560 -msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." -msgstr "尽管此模式名叫“ASCII”（7位编码标准），实际上转换按照8位编码进行。转换UTF-8编码文件时请务必使用此模式。" +#: dos2unix.pod:582 +msgid "If dos2unix has UTF-16 support, UTF-16 encoded files are converted to the current locale character encoding on POSIX systems and to UTF-8 on Windows. Enabling B mode disables the option to keep UTF-16 encoding (C<-u>) and the options to assume UTF-16 input (C<-ul> and C<-ub>). To see if dos2unix has UTF-16 support type C. See also section UNICODE." +msgstr "如果dos2unix带有UTF-16支持，则UTF-16编码的文件在POSIX系统上将被转换为当前语区对应的字符编码，在Windows上则会被转换为UTF-8。启用 B 模式将禁用维持UTF-16编码的选项（C<-u>）和假定输入为UTF-16的选项（C<-ul> 和 C<-ub>）。如需查看dos2unix是否带有UTF-16支持，请运行 C。更多信息另请参见 UNICODE 章节。" #. type: =item -#: dos2unix.pod:564 +#: dos2unix.pod:588 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:566 +#: dos2unix.pod:590 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "在此模式下，所以的8位非ASCII字符（取值范围128-255）将被转换到7位编码空间。" #. type: =item -#: dos2unix.pod:569 +#: dos2unix.pod:593 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:571 +#: dos2unix.pod:595 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Unix下，将在DOS字符集（编码页）和ISO字符集 ISO-8859-1（Latin-1）之间进行转换。不具有 ISO-8859-1 中对等字符的DOS字符将会被转换为点号（“.”）。当 ISO-8859-1 字符集中没有DOS中的对等字符时也是如此。" #. type: textblock -#: dos2unix.pod:576 +#: dos2unix.pod:600 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "" "当只指定了 C<-iso> 选项时，dos2unix将尝试确定当前活动代码页。若无法确定，则使用默认代码页 CP437（普遍用于美国）。若要强制指定代码页，请使用选项 C<-437>（美国）、C<-850>（西欧）、C<-860>（葡萄牙）、C<-863>（法国、加拿大）或C<-865>（北欧）。\n" "Windows CP1252代码页（西欧）也可以通过选项 C<-1252> 获得支持。若要使用其他代码页，可以结合 iconv(1) 使用dos2unix。iconv可以在很多字符编码间进行转换。" #. type: textblock -#: dos2unix.pod:585 +#: dos2unix.pod:609 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "不对Unicode编码文本使用ISO转换。因这一转换会导致UTF-8编码文件损坏。" #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:611 msgid "Some examples:" msgstr "一些示例：" #. type: textblock -#: dos2unix.pod:589 +#: dos2unix.pod:613 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "从DOS默认编码页转换到Unix Latin-1：" #. type: verbatim -#: dos2unix.pod:591 +#: dos2unix.pod:615 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -1051,12 +1103,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:593 +#: dos2unix.pod:617 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "从DOS CP850转换到Unix Latin-1：" #. type: verbatim -#: dos2unix.pod:595 +#: dos2unix.pod:619 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -1066,12 +1118,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:597 +#: dos2unix.pod:621 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "从Windows CP1252转换到Unix Latin-1：" #. type: verbatim -#: dos2unix.pod:599 +#: dos2unix.pod:623 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -1081,12 +1133,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:601 +#: dos2unix.pod:625 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "从WIndows CP1252转换到Unix UTF-8（Unicode）：" #. type: verbatim -#: dos2unix.pod:603 +#: dos2unix.pod:627 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -1096,12 +1148,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:605 +#: dos2unix.pod:629 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "从Unix Latin-1转换到DOS默认编码页：" #. type: verbatim -#: dos2unix.pod:607 +#: dos2unix.pod:631 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -1111,12 +1163,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:609 +#: dos2unix.pod:633 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "从Unix Latin-1转换到DOS CP850：" #. type: verbatim -#: dos2unix.pod:611 +#: dos2unix.pod:635 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1126,12 +1178,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:637 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "从Unix Latin-1转换到Windows CP1252：" #. type: verbatim -#: dos2unix.pod:615 +#: dos2unix.pod:639 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1141,12 +1193,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:617 +#: dos2unix.pod:641 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "从Unix UTF-8（Unicode）转换到Windows CP1252：" #. type: verbatim -#: dos2unix.pod:619 +#: dos2unix.pod:643 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1156,142 +1208,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:621 +#: dos2unix.pod:645 msgid "See also L and L." msgstr "参见 L et L。" #. type: =head1 -#: dos2unix.pod:626 +#: dos2unix.pod:650 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:628 +#: dos2unix.pod:652 msgid "Encodings" msgstr "编码" #. type: textblock -#: dos2unix.pod:630 +#: dos2unix.pod:654 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "有几种不同的Unicode编码。对于Unix和Linux中的Unicode文件，通常为UTF-8编码。Windows中的文本文件可以是UTF-8、UTF-16或UTF-16BE编码，但大多采用UTF-16格式。" #. type: =head2 -#: dos2unix.pod:635 +#: dos2unix.pod:659 msgid "Conversion" msgstr "转换" #. type: textblock -#: dos2unix.pod:637 -msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." -msgstr "Unicode文本文件可以含有DOS、Unix或Mac断行符，就像普通文本文件一样。" +#: dos2unix.pod:661 +msgid "Unicode text files can have DOS, Unix or Mac line breaks, like ASCII text files." +msgstr "Unicode文本文件可以含有DOS、Unix或Mac断行符，就像ASCII文本文件一样。" #. type: textblock -#: dos2unix.pod:640 +#: dos2unix.pod:664 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "所有版本的dos2unix和unix2dos都可以转换UTF-8文件，因为UTF-8向后兼容ASCII。" #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:667 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C." msgstr "含有Unicode UTF-16支持的dos2unix和unix2dos可以读取小尾序或大尾序的UTF-16编码文本。输入 C 来确定dos2unix在编译是是否启用了UTF-16支持。" #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:671 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "在Unix/Linux中，UTF-16编码文件将被转换为区域字符编码所指定的编码。可以使用 locale(1) 命令来查看当前的区域字符编码。若无法转换，程序将报告转换错误并跳过此文件。" #. type: textblock -#: dos2unix.pod:652 +#: dos2unix.pod:676 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "在Windows中，UTF-16文件被默认转换为UTF-8格式。Windows和Unix/Linux均支持UTF-8格式的文本文件。" #. type: textblock -#: dos2unix.pod:655 +#: dos2unix.pod:679 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "UTF-16和UTF-8编码相互兼容，所以彼此转换时不会丢失文本。倘若转换中出错，比如UTF-16格式的输入文件含有错误，那么该文件将被跳过。" #. type: textblock -#: dos2unix.pod:659 +#: dos2unix.pod:683 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "若使用了 C<-u> 选项，输出文件将会使用和输入文件相同的UTF-16编码。C<-u>选项将阻止程序转换到UTF-8。" #. type: textblock -#: dos2unix.pod:662 +#: dos2unix.pod:686 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "dos2unix和unix2dos没有用于转换UTF-8到UTF-16的选项。" #. type: textblock -#: dos2unix.pod:664 +#: dos2unix.pod:688 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "ISO和7位编码模式的转换无法用于UTF-16文件。" #. type: =head2 -#: dos2unix.pod:666 +#: dos2unix.pod:690 msgid "Byte Order Mark" msgstr "字节序标记" #. type: textblock -#: dos2unix.pod:668 -msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." -msgstr "在Windows中，文本文件一般含有字节序标记（BOM），因为很多Windows程序（包括记事本）默认添加BOM。参见 L。" +#: dos2unix.pod:692 +msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L." +msgstr "在Windows中，文本文件一般含有字节序标记（BOM），因为很多Windows程序（包括记事本）默认添加BOM。参见 L。" #. type: textblock -#: dos2unix.pod:672 +#: dos2unix.pod:696 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "在Unix中，Unicode文件一般不含BOM。假定文本文件使用区域字符编码设置所指定的编码。" #. type: textblock -#: dos2unix.pod:675 +#: dos2unix.pod:699 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "dos2unix只能检测含有BOM文件的UTF-16格式。若UTF-16文件不含BOM，dos2unix会将其视作二进制文件。" #. type: textblock -#: dos2unix.pod:679 +#: dos2unix.pod:703 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "请使用选项 C<-ul> 或 C<-ub> 来转换不含BOM的UTF-16文件。" #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:705 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "dos2unix默认不输出BOM。使用 C<-b> 选项可以让dos2unix将BOM添加到输出文件，如果输入文件也含有BOM的话。" #. type: textblock -#: dos2unix.pod:684 +#: dos2unix.pod:708 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "unix2dos默认输出BOM，如果输入文件也含有BOM的话。使用 C<-r> 可以移除BOM。" #. type: textblock -#: dos2unix.pod:687 +#: dos2unix.pod:711 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "若使用了 C<-m> 选项，dos2unix和unix2dos将总是输出BOM。" #. type: =head2 -#: dos2unix.pod:689 +#: dos2unix.pod:713 msgid "Unicode file names on Windows" msgstr "Windows中Unicode文件的文件名" #. type: textblock -#: dos2unix.pod:691 +#: dos2unix.pod:715 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C." msgstr "dos2unix对于Windows命令提示符中读取和写入Unicode文件名有额外的支持。这意味着dos2unix可以打开那些包含非默认系统ANSI编码页字符的文件。若要查看Windows版dos2unix在编译时是否加入了Unicode文件名支持，请输入 C。" #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:721 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "在Windows终端中显示Unicode文件名有一些需要注意的问题。请参见 C<-D> 和 C<--display-enc> 选项。文件名在终端中可能无法被正确显示，但写入文件时文件名仍然是正确的。" #. type: =head2 -#: dos2unix.pod:701 +#: dos2unix.pod:725 msgid "Unicode examples" msgstr "Unicode示例" #. type: textblock -#: dos2unix.pod:703 +#: dos2unix.pod:727 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "转换Windows UTF-16到Unix UTF-8：" #. type: verbatim -#: dos2unix.pod:705 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1301,12 +1353,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:731 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "转换Windows UTF-16LE（不含BOM）到Unix UTF-8：" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:733 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1316,12 +1368,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:735 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "转换Unix UTF-8到Windows UTF-8（并添加BOM）：" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:737 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1331,12 +1383,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:739 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "转换Unix UTF-8到Windows UTF-16：" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:741 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1346,47 +1398,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:719 +#: dos2unix.pod:743 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:721 -msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." -msgstr "GB18030是中国国家标准。GB18030标准的一系列子集被强制应用于中国销售的软件产品。参见 L。" +#: dos2unix.pod:745 +msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L." +msgstr "GB18030是中国国家标准。GB18030标准的一系列子集被强制应用于中国销售的软件产品。参见 L。" #. type: textblock -#: dos2unix.pod:725 +#: dos2unix.pod:749 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "GB18030与Unicode完全兼容，并且可以被认为是Unicode格式的变体。和UTF-8一样，GB18030也兼容ASCII。GB18030也兼容Windows 936代码页（GBK）。" #. type: textblock -#: dos2unix.pod:729 +#: dos2unix.pod:753 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C to get the list of supported locales." msgstr "在Unix/Linux中，若区域编码被设置为GB18030，UTF-16文件将被转换为GB18030格式。注意只有当系统支持区域设置时这一才会进行这一转换。可以使用 C 命令来获取受支持的区域。" #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:757 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "在Windows中，你需要使用 C<-gb> 选项来转换UTF-16文件到GB18030编码。" #. type: textblock -#: dos2unix.pod:735 +#: dos2unix.pod:759 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "GB18030编码的文件和Unicode文件一样可以含有BOM。" #. type: =head1 -#: dos2unix.pod:737 +#: dos2unix.pod:761 msgid "EXAMPLES" msgstr "示例" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:763 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "从标准输入读取，并输出到标准输出：" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:765 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1398,12 +1450,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:744 +#: dos2unix.pod:768 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "转换并覆盖a.txt和b.txt：" #. type: verbatim -#: dos2unix.pod:746 +#: dos2unix.pod:770 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1415,12 +1467,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:749 +#: dos2unix.pod:773 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "转换并覆盖a.txt，使用ascii模式：" #. type: verbatim -#: dos2unix.pod:751 +#: dos2unix.pod:775 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1430,12 +1482,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:753 +#: dos2unix.pod:777 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "转换并覆盖a.txt，使用ascii模式；转换并覆盖b.txt，使用7位编码模式：" #. type: verbatim -#: dos2unix.pod:756 +#: dos2unix.pod:780 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1449,12 +1501,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:760 +#: dos2unix.pod:784 msgid "Convert a.txt from Mac to Unix format:" msgstr "将a.txt从Mac格式转换到Unix格式：" #. type: verbatim -#: dos2unix.pod:762 +#: dos2unix.pod:786 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1466,12 +1518,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:765 +#: dos2unix.pod:789 msgid "Convert a.txt from Unix to Mac format:" msgstr "将a.txt从Unix格式转换到Mac格式：" #. type: verbatim -#: dos2unix.pod:767 +#: dos2unix.pod:791 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1483,12 +1535,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:770 +#: dos2unix.pod:794 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "转换并覆盖a.txt，保留原始时间戳：" #. type: verbatim -#: dos2unix.pod:772 +#: dos2unix.pod:796 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1500,12 +1552,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:775 +#: dos2unix.pod:799 msgid "Convert a.txt and write to e.txt:" msgstr "转换a.txt，并输出到e.txt：" #. type: verbatim -#: dos2unix.pod:777 +#: dos2unix.pod:801 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1515,12 +1567,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:779 +#: dos2unix.pod:803 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "转换a.txt，并输出到e.txt，同时使e.txt的时间戳和a.txt一致：" #. type: verbatim -#: dos2unix.pod:781 +#: dos2unix.pod:805 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1530,12 +1582,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:783 +#: dos2unix.pod:807 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "转换并覆盖a.txt；转换b.txt并输出到e.txt：" #. type: verbatim -#: dos2unix.pod:785 +#: dos2unix.pod:809 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1547,12 +1599,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:788 +#: dos2unix.pod:812 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "转换c.txt并输出到e.txt；转换并覆盖a.txt和b.txt；转换d.txt并输出到f.txt：" #. type: verbatim -#: dos2unix.pod:791 +#: dos2unix.pod:815 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1562,17 +1614,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:793 +#: dos2unix.pod:817 msgid "RECURSIVE CONVERSION" msgstr "递归转换" #. type: textblock -#: dos2unix.pod:795 +#: dos2unix.pod:819 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "结合 find(1) 和 xargs(1) 使用 dos2unix 可以递归地转换目录树中的文本文件。例如，转换当前目录的目录树中所有的 .txt 文件：" #. type: verbatim -#: dos2unix.pod:799 +#: dos2unix.pod:823 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1583,12 +1635,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:801 +#: dos2unix.pod:825 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "若文件名中有空格或引号，则需要使用 find(1) 选项 C<-print0> 及相应的 xargs(1) 选项 C<-0>；其他情况下则可以省略它们。也可以结合 C<-exec> 选项来使用 find(1)：" #. type: verbatim -#: dos2unix.pod:805 +#: dos2unix.pod:829 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1598,12 +1650,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:807 +#: dos2unix.pod:831 msgid "In a Windows Command Prompt the following command can be used:" msgstr "在Windows命令提示符中，可以使用下列命令：" #. type: verbatim -#: dos2unix.pod:809 +#: dos2unix.pod:833 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1613,12 +1665,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:811 +#: dos2unix.pod:835 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "PowerShell用户可以在Windows PowerShell中使用如下命令：" #. type: verbatim -#: dos2unix.pod:813 +#: dos2unix.pod:837 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1628,22 +1680,22 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:816 +#: dos2unix.pod:840 msgid "LOCALIZATION" msgstr "区域" #. type: =item -#: dos2unix.pod:820 +#: dos2unix.pod:844 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:822 +#: dos2unix.pod:846 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "LANG环境变量指定了程序所使用的首选语言。它包括几个部分：第一部分是小写的语言编码，第二部分是（可选的）大写的国家/地区代码，前面用下划线连接；第三部分也是可选的，即字符编码，前面用点连接。一些POSIX规范的示例如下：" #. type: verbatim -#: dos2unix.pod:829 +#: dos2unix.pod:853 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1665,47 +1717,47 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:837 -msgid "For a complete list of language and country codes see the gettext manual: L" -msgstr "完整的语言和国家/地区编码可以在gettext手册中找到：L" +#: dos2unix.pod:861 +msgid "For a complete list of language and country codes see the gettext manual: L" +msgstr "完整的语言和国家/地区编码可以在gettext手册中找到：L" #. type: textblock -#: dos2unix.pod:840 +#: dos2unix.pod:864 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "在Unix系统中，你可以使用 locale(1) 命令获取特定区域的信息。" #. type: =item -#: dos2unix.pod:843 +#: dos2unix.pod:867 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:845 -msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" -msgstr "可以使用LANGUAGE变量指定一系列语言的优先级，各项之间由冒号分割。dos2unix首先使用LANGUAGE变量，其次才是LANG。例如，首选中文、其次英文：C。在使用语言优先级之前，必须先启用区域化功能，即将LANG（或LC_ALL）变量设置为除了“C”以外的其他值。参见gettext手册：L" +#: dos2unix.pod:869 +msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L" +msgstr "可以使用LANGUAGE变量指定一系列语言的优先级，各项之间由冒号分割。dos2unix首先使用LANGUAGE变量，其次才是LANG。例如，首选中文、其次英文：C。在使用语言优先级之前，必须先启用区域化功能，即将LANG（或LC_ALL）变量设置为除了“C”以外的其他值。参见gettext手册：L" #. type: textblock -#: dos2unix.pod:853 +#: dos2unix.pod:877 msgid "If you select a language which is not available you will get the standard English messages." msgstr "如果你选择了一个不可用的语言，程序将会输出标准的英语信息。" #. type: =item -#: dos2unix.pod:857 +#: dos2unix.pod:881 msgid "B" msgstr "B" #. type: textblock -#: dos2unix.pod:859 +#: dos2unix.pod:883 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C. Option B<--version> will display the LOCALEDIR that is used." msgstr "DOS2UNIX_LOCALEDIR环境变量将覆盖编译时设置的LOCALEDIR变量。LOCALEDIR被用于查找语言文件。GNU程序的默认值为 C。可以使用 B<--version> 查看当前的LOCALEDIR。" #. type: textblock -#: dos2unix.pod:864 +#: dos2unix.pod:888 msgid "Example (POSIX shell):" msgstr "示例（POSIX shell）：" #. type: verbatim -#: dos2unix.pod:866 +#: dos2unix.pod:890 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1715,75 +1767,84 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:871 +#: dos2unix.pod:895 msgid "RETURN VALUE" msgstr "返回值" #. type: textblock -#: dos2unix.pod:873 +#: dos2unix.pod:897 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "若成功，返回0。若出现系统错误，则返回最近一次系统错误号。若发生其他错误，返回1。" #. type: textblock -#: dos2unix.pod:876 +#: dos2unix.pod:900 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "在安静模式下，返回值总是为0，除非命令行选项有误。" #. type: =head1 -#: dos2unix.pod:879 +#: dos2unix.pod:903 msgid "STANDARDS" msgstr "遵循规范" #. type: textblock -#: dos2unix.pod:881 -msgid "L" -msgstr "L" +#: dos2unix.pod:905 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:883 -msgid "L" -msgstr "L" +#: dos2unix.pod:907 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:885 -msgid "L" -msgstr "L" +#: dos2unix.pod:909 +msgid "L" +msgstr "L" #. type: textblock -#: dos2unix.pod:887 -msgid "L" -msgstr "L" +#: dos2unix.pod:911 +msgid "L" +msgstr "L" #. type: =head1 -#: dos2unix.pod:889 +#: dos2unix.pod:913 msgid "AUTHORS" msgstr "作者" #. type: textblock -#: dos2unix.pod:891 +#: dos2unix.pod:915 msgid "Benjamin Lin - , Bernd Johannes Wuebben (mac2unix mode) - , Christian Wurll (add extra newline) - , Erwin Waterlander - (maintainer)" msgstr "Benjamin Lin - Bernd Johannes Wuebben（mac2unix模式） - ，Christian Wurll（添加额外新行） - ，Erwin Waterlander - （维护者）" #. type: textblock -#: dos2unix.pod:896 -msgid "Project page: L" -msgstr "项目主页：L" +#: dos2unix.pod:920 +msgid "Project page: L" +msgstr "项目主页：L" #. type: textblock -#: dos2unix.pod:898 -msgid "SourceForge page: L" -msgstr "SourceForge主页：L" +#: dos2unix.pod:922 +msgid "SourceForge page: L" +msgstr "SourceForge主页：L" #. type: =head1 -#: dos2unix.pod:900 +#: dos2unix.pod:924 msgid "SEE ALSO" msgstr "参见" #. type: textblock -#: dos2unix.pod:902 +#: dos2unix.pod:926 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" +#~ msgid "Convert only line breaks. This is the default conversion mode." +#~ msgstr "只转换断行符。这是默认的转换模式。" + +#~ msgid "In mode C only line breaks are converted. This is the default conversion mode." +#~ msgstr "在 C 模式下，只转换断行符。 这是默认的转换模式。" + +#~ msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." +#~ msgstr "尽管此模式名叫“ASCII”（7位编码标准），实际上转换按照8位编码进行。转换UTF-8编码文件时请务必使用此模式。" + #~ msgid "" #~ " find -name '*.txt' | xargs dos2unix -ic\n" #~ "\n" diff --git a/dos2unix/po/ca.po b/dos2unix/po/ca.po index 64e7a5c..b6d485b 100644 --- a/dos2unix/po/ca.po +++ b/dos2unix/po/ca.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix-7.3.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" "PO-Revision-Date: 2022-07-12 22:02+0200\n" "Last-Translator: Jordi Mas i Hernàndez \n" "Language-Team: Catalan \n" @@ -152,7 +152,8 @@ msgstr " --allow-chown permet el canvi de propietat del fitxer\n" # #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" +#, fuzzy +msgid " -ascii default conversion mode\n" msgstr " -ascii converteix només salts de línia (per defecte)\n" # @@ -500,22 +501,22 @@ msgid "Writing %s BOM.\n" msgstr "S'està escrivint %s BOM.\n" # -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" # -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" # -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" # -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -539,122 +540,122 @@ msgstr "S'assumeix la codificació UTF-16BE.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "problemes en resoldre l'enllaç simbòlic «%s»\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " el fitxer de sortida roman a «%s»\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "No s'ha pogut obrir el fitxer de sortida temporal: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "s'està usant %s com a fitxer temporal\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "No s'han pogut canviar els permisos del fitxer de sortida temporal %s:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "No es conserva la propietat d'usuari i/o grup del fitxer %s.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "No s'ha pogut canviar el propietari i el grup del fitxer de sortida temporal %s:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problemes reanomenant «%s» a «%s»:" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " quin és l'objectiu de l'enllaç simbòlic «%s»\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " el fitxer de sortida roman a «%s»\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "S'està ometent el fitxer binari %s\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "la pàgina de codis %d no està suportada.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "S'omet el fitxer UTF-16 %s, la mida del wchart és de %d bytes.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "S'omet el fitxer UTF-16 %s, s'ha produït un error de conversió UTF-16 a la línia %u.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "S'omet el fitxer UTF-16 %s, la conversió UTF-16 no està suportada en aquesta versió de %s.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "S'omet %s, no és un fitxer normal.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "S'està ometent %s, el fitxer de sortida %s és un enllaç simbòlic.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "S'està ometent l'enllaç simbòlic %s.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "S'està ometent l'enllaç simbòlic %s, la destinació no és un fitxer normal.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "S'està ometent %s, l'objectiu de l'enllaç simbòlic %s no és un fitxer normal.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "s'està convertint el fitxer %s al fitxer %s en format Unix...\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "s'està convertint el fitxer %s al format Unix...\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "s'està convertint el fitxer %s al fitxer %s en format Mac...\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "s'està convertint el fitxer %s al format Mac...\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "s'està convertint el fitxer %s al fitxer %s en format DOS...\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "s'està convertint el fitxer %s al format DOS...\n" @@ -665,7 +666,7 @@ msgstr "s'està convertint el fitxer %s al format DOS...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "s'està convertint %s fitxer %s a %s fitxer %s en format Unix...\n" @@ -675,93 +676,93 @@ msgstr "s'està convertint %s fitxer %s a %s fitxer %s en format Unix...\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "s'està convertint el fitxer %s %s al format %s Unix...\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "s'està convertint %s fitxer %s a %s fitxer %s en format Mac...\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "s'està convertint el fitxer %s %s al format Mac %s...\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "s'està convertint %s fitxer %s a %s fitxer %s en format DOS...\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "s'està convertint el fitxer %s %s al format %s DOS...\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "problemes en convertir el fitxer %s al fitxer %s\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "problemes en convertir el fitxer %s\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "no es pot llegir del fitxer d'entrada %s:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "senyalador incorrecte «%c» per a l'opció -i o --info\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "pàgina de codis activa: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "s'ha especificat un mode de conversió %s no vàlid\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "l'opció «%s» requereix un argument\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "s'ha especificat una codificació de pantalla %s no vàlida\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "no s'ha especificat l'objectiu del fitxer %s en el mode de fitxer nou\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "no es pot llegir del fitxer d'entrada: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "no es pot escriure al fitxer de sortida: %s\n" # -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "error: parella suplent invàlida. Manca un substitut baix.\n" # -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "error: parella suplent invàlida. Manca un gran substitut.\n" diff --git a/dos2unix/po/da.po b/dos2unix/po/da.po index 3201219..a416b6f 100644 --- a/dos2unix/po/da.po +++ b/dos2unix/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" "PO-Revision-Date: 2018-08-14 12:07+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -152,7 +152,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown tillad ændring af filejerskab\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" +#, fuzzy +msgid " -ascii default conversion mode\n" msgstr " -ascii omdan kun linjeskift (standard)\n" #: common.c:653 @@ -437,19 +438,19 @@ msgstr "Sti til midlertidig uddatafil er for lang:" msgid "Writing %s BOM.\n" msgstr "Skriver %s BOM.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -471,122 +472,122 @@ msgstr "Antager UTF-16BE-kodning.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "problemer med at følge symbolsk henvisning \"%s\"\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " outputfil forbliver i \"%s\"\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Åbning af midlertidig outputfil mislykkedes: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "bruger %s som midlertidig fil\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Ændring af tilladelser for midlertidig outputfil %s mislykkedes:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "Bruger- og/eller gruppeejerskab for filen %s bevares ikke.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Ændring af ejer og gruppe for midlertidig outputfil %s mislykkedes:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "der opstod problemer under omdøbning af »%s« til »%s«:" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " som er målet for symbolsk henvisning \"%s\"\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " outputfil forbliver i \"%s\"\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "Springer binær fil %s over\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "tegnkodningstabel %d understøttes ikke.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Springer UTF-16-filen %s over. Størrelsen på wchar_t er %d byte.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Springer UTF-16-filen %s over. Der opstod en UTF-16-konverteringsfejl på linje %u.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Springer UTF-16-filen %s over. UTF-16-konvertering er ikke understøttet i denne version af %s.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Springer %s over, ikke en almindelig fil.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Springer %s over. Outputfil %s er en symbolsk henvisning.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Springer symbolsk henvisning %s over.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Springer symbolsk henvisning %s over. Målet er ikke en almindelig fil.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Springer %s over. Målet for symbolsk henvisning %s er ikke en almindelig fil.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "omdanner fil %s til fil %s i Unix-format …\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "omdanner fil %s til Unix-format …\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "omdanner fil %s til fil %s i Mac-format …\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "omdanner fil %s til Mac-format …\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "omdanner fil %s til fil %s i DOS-format …\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "omdanner fil %s til DOS-format …\n" @@ -597,7 +598,7 @@ msgstr "omdanner fil %s til DOS-format …\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "omdanner %s-filen %s til %s-filen %s i Unix-format …\n" @@ -607,90 +608,90 @@ msgstr "omdanner %s-filen %s til %s-filen %s i Unix-format …\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "omdanner %s-filen %s til %s-Unix-format …\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "omdanner %s-filen %s til %s-filen %s i Mac-format …\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "omdanner %s-filen %s til %s-Mac-format …\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "omdanner %s-filen %s til %s-filen %s i DOS-format …\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "omdanner %s-filen %s til %s-DOS-format …\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "problemer under omdannelse af fil %s til fil %s\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "problemer under omdannelse af fil %s\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "kan ikke læse fra inputfilen %s:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "forkert flag »%c« for tilvalget -i eller --info\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "aktuel tegnkodningstabel: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "ugyldig %s omdannelsestilstand specificeret\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "tilvalg \"%s\" kræver et argument\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "ugyldig visningskodning %s specificeret\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "mål for fil %s er ikke angivet i ny-fil-tilstand\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "kan ikke læse fra inputfil: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "kan ikke skrive til outputfil: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "fejl: Ugyldigt surrogatpar. Mangler lav surrogat.\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "fejl: Ugyldigt surrogatpar. Mangler høj surrogat.\n" diff --git a/dos2unix/po/de.po b/dos2unix/po/de.po index 85a3065..5c8dcf8 100644 --- a/dos2unix/po/de.po +++ b/dos2unix/po/de.po @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.5.0-beta5\n" +"Project-Id-Version: dos2unix 7.5.2-beta2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" -"PO-Revision-Date: 2023-04-26 18:43+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" +"PO-Revision-Date: 2023-11-10 16:28+0100\n" "Last-Translator: Roland Illig \n" "Language-Team: German \n" "Language: de\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 3.2.2\n" +"X-Generator: Poedit 3.4.1\n" #: dos2unix.c:79 #, c-format @@ -157,8 +157,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown erlaubt die Änderung des Dateieigentümers\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii wandelt nur Zeilenumbrüche um (Vorgabe)\n" +msgid " -ascii default conversion mode\n" +msgstr " -ascii Vorgabeumwandlungsmodus\n" #: common.c:653 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" @@ -442,19 +442,19 @@ msgstr "Der Pfad für die temporäre Ausgabedatei ist zu lang:" msgid "Writing %s BOM.\n" msgstr "Das %s-BOM wird geschrieben.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -476,122 +476,122 @@ msgstr "Es wird UTF-16BE-Kodierung angenommen.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "Es gab Probleme beim Auflösen der symbolischen Verknüpfung »%s«.\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " Die Ausgabedatei verbleibt in »%s«\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Die temporäre Ausgabedatei konnte nicht geöffnet werden: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "%s wird als temporäre Datei verwendet\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Das Ändern der Rechte der temporären Ausgabedatei %s scheiterte:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "Die Benutzer-/Gruppenzuordnung der Datei %s wird nicht erhalten.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Das Ändern des Eigentümers und der Gruppe der temporären Ausgabedatei %s scheiterte:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "Beim Umbenennen von »%s« zu »%s« sind Probleme aufgetreten:" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " welche das Ziel der symbolischen Verknüpfung »%s« ist\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " Die Ausgabedatei verbleibt in »%s«\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "Binäre Datei %s wird übersprungen\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "Codepage %d wird nicht unterstützt.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "UTF-16 Datei %s wird übersprungen, da wchar_t %d Bytes groß ist.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "UTF-16-Datei %s wird übersprungen, da beim Umwandeln ein Fehler in Zeile %u auftrat.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "UTF-16-Datei %s wird übersprungen, da die Umwandlung von UTF-16 in dieser Version von %s nicht unterstützt wird.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "%s wird übersprungen, da sie keine reguläre Datei ist.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "%s wird übersprungen, Ausgabedatei %s ist eine symbolische Verknüpfung.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Symbolische Verknüpfung %s wird übersprungen.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Symbolische Verknüpfung %s wird übersprungen, da das Ziel keine reguläre Datei ist.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "%s wird übersprungen, das Ziel der symbolischen Verknüpfung %s ist keine reguläre Datei.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "Datei %s wird zu Datei %s im Unix-Format umgewandelt …\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "Datei %s wird ins Unix-Format umgewandelt …\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "Datei %s wird in Datei %s im Mac-Format umgewandelt …\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "Datei %s wird ins Mac-Format umgewandelt …\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "Datei %s wird in Datei %s im DOS-Format umgewandelt …\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "Datei %s wird ins DOS-Format umgewandelt …\n" @@ -602,7 +602,7 @@ msgstr "Datei %s wird ins DOS-Format umgewandelt …\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "%s-Datei %s wird zu %s-Datei %s im Unix-Format umgewandelt …\n" @@ -612,90 +612,90 @@ msgstr "%s-Datei %s wird zu %s-Datei %s im Unix-Format umgewandelt …\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "%s-Datei %s wird ins %s-Unix-Format umgewandelt …\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "%s-Datei %s wird in %s-Datei %s im Mac-Format umgewandelt …\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "%s-Datei %s wird ins %s-Mac-Format umgewandelt …\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "%s-Datei %s wird in %s-Datei %s im DOS-Format umgewandelt …\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "%s-Datei %s wird ins %s-DOS-Format umgewandelt …\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "Beim Umwandeln von Datei %s zu Datei %s sind Probleme aufgetreten\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "Beim Umwandeln von Datei %s sind Probleme aufgetreten\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "Aus der Eingabedatei %s kann nicht gelesen werden:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "falsches Flag »%c« für Option -i oder --info\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "Aktive Codepage: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "Der angegebene Umwandlungsmodus %s ist unzulässig\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "Die Option »%s« benötigt ein Argument\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "Die angegebene Anzeigekodierung %s ist unzulässig\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "Das Ziel der Datei %s wurde für den Neudatei-Modus nicht angegeben\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "Aus der Eingabedatei kann nicht gelesen werden: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "In die Ausgabedatei kann nicht geschrieben werden: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "Fehler: Ungültiges Surrogate-Paar. Das Low-Surrogate fehlt.\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "Fehler: Ungültiges Surrogate-Paar. Das High-Surrogate fehlt.\n" diff --git a/dos2unix/po/dos2unix.pot b/dos2unix/po/dos2unix.pot index c462bdd..3d83f59 100644 --- a/dos2unix/po/dos2unix.pot +++ b/dos2unix/po/dos2unix.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-08-29 20:44+0200\n" +"POT-Creation-Date: 2024-01-22 21:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -119,7 +119,7 @@ msgid " --allow-chown allow file ownership change\n" msgstr "" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" +msgid " -ascii default conversion mode\n" msgstr "" #: common.c:653 @@ -388,19 +388,19 @@ msgstr "" msgid "Writing %s BOM.\n" msgstr "" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "" @@ -422,122 +422,122 @@ msgstr "" msgid "problems resolving symbolic link '%s'\n" msgstr "" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr "" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr "" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr "" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "" @@ -548,7 +548,7 @@ msgstr "" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "" @@ -558,90 +558,90 @@ msgstr "" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "" diff --git a/dos2unix/po/eo.po b/dos2unix/po/eo.po index 4efff8d..813bfd7 100644 --- a/dos2unix/po/eo.po +++ b/dos2unix/po/eo.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" "PO-Revision-Date: 2021-03-17 14:19-0300\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" @@ -151,7 +151,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown permesi ŝanĝon de dosier-posendanto\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" +#, fuzzy +msgid " -ascii default conversion mode\n" msgstr " -ascii konverti nur linifinojn (defaŭlto)\n" #: common.c:653 @@ -436,19 +437,19 @@ msgstr "Vojo al provizora eliga dosiero tro longas:" msgid "Writing %s BOM.\n" msgstr "Skribiĝas %s-BOM.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -470,122 +471,122 @@ msgstr "Supoziĝas UTF-16BE-kodprezento.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "problemoj dum redukto de simbola ligo '%s'\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " eliga dosiero restas en '%s'\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Malsukcesis malfermi provizoran eligan dosieron: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "uziĝas %s kiel provizora dosiero\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Malsukcesis ŝanĝi la permesojn de provizora eliga dosiero %s:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "La posedanteco de uzanto kaj/aŭ grupo de la dosiero %s ne estas tenita.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Malsukcesis ŝanĝi posedanton kaj grupon de provizora eliga dosiero %s:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problemoj dum alinomigo de '%s' al '%s':" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " kiu estas la celo de simbola ligo '%s'\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " eliga dosiero restas en '%s'\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "Preterpasiĝas duuma dosiero %s\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "Kodpaĝo %d ne subtenatas.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Preterpasiĝas UTF-16-a dosiero %s; la grando de 'wchar_t' estas %d bajtoj.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Preterpasiĝas UTF-16-a dosiero %s; okazis konverteraro de UTF-16 en linio %u.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Preterpasiĝas UTF-16-a dosiero %s, konverto de UTF-16 ne subtenatas en tiu ĉi versio de %s.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Preterpasiĝas %s; ĝi ne estas normala dosiero.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Preterpasiĝas %s; eliga dosiero %s estas simbola ligo.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Preterpasiĝas simbola ligo %s.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Preterpasiĝas simbola ligo %s; la celo ne estas normala dosiero.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Preterpasiĝas %s; la celo de simbola ligo %s ne estas normala dosiero.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "konvertiĝas dosiero %s al dosiero %s Unix-en...\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "konvertiĝas dosiero %s Unix-en...\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "konvertiĝas dosiero %s al dosiero %s Mac-en...\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "konvertiĝas dosiero %s Mac-en...\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "konvertiĝas dosiero %s al dosiero %s DOS-en...\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "konvertiĝas dosiero %s DOS-en...\n" @@ -596,7 +597,7 @@ msgstr "konvertiĝas dosiero %s DOS-en...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "konvertiĝas dosiero %2$s (%1$s) Unix-en al dosiero %4$s (%3$s)...\n" @@ -606,91 +607,91 @@ msgstr "konvertiĝas dosiero %2$s (%1$s) Unix-en al dosiero %4$s (%3$s)...\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "konvertiĝas dosiero %2$s (%1$s) Unix-en (%3$s)...\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "konvertiĝas dosiero %2$s (%1$s) Mac-en al dosiero %4$s (%3$s)...\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "konvertiĝas dosiero %2$s (%1$s) Mac-en (%3$s)...\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "konvertiĝas dosiero %2$s (%1$s) DOS-en al dosiero %4$s (%3$s)...\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "konvertiĝas dosiero %2$s (%1$s) DOS-en (%3$s)...\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "problemoj dum konverto de dosiero %s al dosiero %s\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "problemoj dum konverto de dosiero %s\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "ne eblas legi el eniga dosiero %s:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "malĝusta flago '%c' por opcio '-i' aŭ '--info'\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "aktiva kodpaĝo: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "malvalida konvertmoduso %s indikatas\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "opcio '%s' bezonas argumenton\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "malvalida montra kodprezento %s indikatas\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "celo de dosiero %s ne indikatas (en novdosiera moduso)\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "ne eblas legi el eniga dosiero: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "ne eblas skribi al eliga dosiero: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "eraro: nevalida surogata paro -- mankas la baza parto\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "eraro: nevalida surogata paro -- mankas la supra parto\n" diff --git a/dos2unix/po/es.po b/dos2unix/po/es.po index 34a78d2..5bbc013 100644 --- a/dos2unix/po/es.po +++ b/dos2unix/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3.1-beta5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" "PO-Revision-Date: 2015-09-20 14:17+0200\n" "Last-Translator: Enrique Lazcorreta Puigmartí \n" "Language-Team: Spanish \n" @@ -155,7 +155,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr "" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" +#, fuzzy +msgid " -ascii default conversion mode\n" msgstr " -ascii solamente convierte los saltos de línea (por defecto)\n" #: common.c:653 @@ -439,19 +440,19 @@ msgstr "Error al escribir el archivo de salida temporal %s:" msgid "Writing %s BOM.\n" msgstr "Escribiendo BOM %s.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -473,122 +474,122 @@ msgstr "Se asume codificación UTF-16BE.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "problemas al resolver el enlace simbólico '%s'\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " el archivo de salida permanece en '%s'\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Error al abrir el archivo de salida temporal: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "usando %s como archivo temporal\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Error al cambiar los permisos del archivo temporal de salida %s:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Error al cambiar el propietario y grupo del archivo temporal de salida %s:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problemas al renombrar '%s' como '%s':" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " cual es el destino del enlace simbólico '%s'\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " el archivo de salida permanece en '%s'\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "Ignorando archivo binario %s\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "La página de códigos %d no está soportada.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Ignorando archivo UTF-16 %s, el tamaño de wchar_t es %d bytes.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Ignorando archivo UTF-16 %s, ocurrió un error de conversión a UTF-16 en la línea %u.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Ignorando archivo UTF-16 %s, la conversión a UTF-16 no está soportada en esta versión de %s.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Ignorando %s, no es un archivo regular.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Ignorando %s, el archivo de salida %s es un enlace simbólico.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Ignorando enlace simbólico %s.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Ignorando enlace simbólico %s, el destino no es un archivo regular.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Ignorando %s, el destino del enlace simbólico %s no es un archivo regular.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "convirtiendo archivo %s a %s in formato Unix...\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "convirtiendo archivo %s a formato Unix...\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "convirtiendo archivo %s a %s in formato Mac...\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "convirtiendo archivo %s a formato Mac...\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "convirtiendo archivo %s a %s en formato DOS...\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "convirtiendo archivo %s a formato DOS...\n" @@ -599,7 +600,7 @@ msgstr "convirtiendo archivo %s a formato DOS...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "convirtiendo archivo %s %s en archivo %s %s en formato Unix...\n" @@ -609,91 +610,91 @@ msgstr "convirtiendo archivo %s %s en archivo %s %s en formato Unix...\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "convirtiendo archivo %s %s a formato %s Unix...\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "convirtiendo archivo %s %s en archivo %s %s en formato Mac...\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "convirtiendo archivo %s %s a formato %s Mac...\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "convirtiendo archivo %s %s en archivo %s %s en formato DOS...\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "convirtiendo archivo %s %s a formato %s DOS...\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "problemas al convertir el archivo %s a %s\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "problemas convirtiendo el archivo %s\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "no puedo escribir al archivo de salida: %s" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "'%c' es un valor incorrecto para la opción -i o --info\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "Página de códigos activa: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "modo de conversión %s especificado es inválido\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "el parámetro '%s' requiere un argumento\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "el modo de conversión %s especificado no es válido\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "el destino del archivo %s no se especificó en el modo de archivo nuevo\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "no puedo escribir al archivo de salida: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "no puedo escribir al archivo de salida: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "error: Par sustituto no válido. Falta el sustituto bajo.\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "error: Par sustituto no válido. Falta el sustituto alto.\n" diff --git a/dos2unix/po/fr.po b/dos2unix/po/fr.po index b5ed28d..9e0930f 100644 --- a/dos2unix/po/fr.po +++ b/dos2unix/po/fr.po @@ -4,10 +4,10 @@ # Frédéric Marchal , 2023. msgid "" msgstr "" -"Project-Id-Version: dos2unix-7.5.0-beta5\n" +"Project-Id-Version: dos2unix-7.5.2-beta2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" -"PO-Revision-Date: 2023-04-26 17:43+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" +"PO-Revision-Date: 2023-11-10 15:33+0100\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" "Language: fr\n" @@ -147,8 +147,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown autorise le changement de propriétaire du fichier\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii converti uniquement les sauts de ligne (par défaut)\n" +msgid " -ascii default conversion mode\n" +msgstr " -ascii mode de conversion par défaut\n" #: common.c:653 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" @@ -429,19 +429,19 @@ msgstr "Le chemin pour le fichier de sortie temporaire est trop long :" msgid "Writing %s BOM.\n" msgstr "Écriture de la BOM %s.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -463,122 +463,122 @@ msgstr "Suppose un encodage UTF-16BE.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "problème lors de la résolution du lien symbolique « %s »\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " le fichier de sortie reste dans « %s »\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Échec à l'ouverture du fichier temporaire de sortie : %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "utilise %s comme fichier temporaire\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Échec lors du changement des permissions du fichier temporaire de sortie %s :" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "L'utilisateur ou le groupe propriétaire du fichier %s ne sont pas préservés.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Échec lors du changement du propriétaire et du groupe du fichier temporaire de sortie %s :" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problèmes en renommant « %s » en « %s » :" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " quelle est la cible du lien symbolique « %s »\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " le fichier de sortie reste dans « %s »\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "Ignore le fichier binaire %s\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "le code page %d n'est pas supporté.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Ignore le fichier UTF-16 %s, la taille de wchar_t n'est pas de %d octets.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Ignore le fichier UTF-16 %s, une erreur de conversion UTF-16 a eu lieu à la ligne %u.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Ignore le fichier UTF-16 %s, la conversion UTF-16 n'est pas supportée dans cette version de %s.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Ignore %s, pas un fichier régulier.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Ignore %s, le fichier de sortie %s est un lien symbolique.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Ignore le lien symbolique %s.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Ignore le lien symbolique %s, la cible n'est pas un fichier régulier.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Ignore %s, la cible du lien symbolique %s n'est pas un fichier régulier.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "conversion du fichier %s vers le fichier %s au format Unix…\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "conversion du fichier %s au format Unix…\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "conversion du fichier %s vers le fichier %s au format Mac…\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "conversion du fichier %s au format Mac…\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "conversion du fichier %s vers le fichier %s au format DOS…\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "conversion du fichier %s au format DOS…\n" @@ -589,7 +589,7 @@ msgstr "conversion du fichier %s au format DOS…\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "conversion du fichier %s %s vers le fichier %s %s au format Unix…\n" @@ -599,91 +599,91 @@ msgstr "conversion du fichier %s %s vers le fichier %s %s au format Unix…\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "conversion du fichier %s %s au format Unix %s…\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "conversion du fichier %s %s vers le fichier %s %s au format Mac…\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "conversion du fichier %s %s au format Mac %s…\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "conversion du fichier %s %s vers le fichier %s %s au format DOS…\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "conversion du fichier %s %s au format DOS %s…\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "problèmes lors de la conversion du fichier %s vers le fichier %s\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "problèmes lors de la conversion du fichier %s\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "impossible de lire depuis le fichier d'entrée %s :" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "mauvais fanion « %c » pour l'option -i ou --info\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "code page actif : %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "mode de conversion %s spécifié invalide\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "l'option « %s » requiert un argument\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "l'encodage %s spécifié pour l'affichage est invalide\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "la cible du fichier %s n'est pas spécifiée en mode nouveau fichier\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "impossible de lire depuis le fichier d'entrée : %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "impossible d'écrire dans le fichier de sortie : %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "erreur: Demi-codet invalide. Le demi-codet bas est manquant.\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "erreur: Demi-codet invalide. Le demi-codet haut est manquant.\n" diff --git a/dos2unix/po/fur.po b/dos2unix/po/fur.po index 537d83c..80a34f4 100644 --- a/dos2unix/po/fur.po +++ b/dos2unix/po/fur.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix-7.3.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" "PO-Revision-Date: 2020-07-09 17:14+0200\n" "Last-Translator: Fabio Tomat \n" "Language-Team: Friulian \n" @@ -152,7 +152,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown permet la modifiche dal possès dal file\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" +#, fuzzy +msgid " -ascii default conversion mode\n" msgstr " -ascii convertìs dome lis interuzions di rie (predefinît)\n" #: common.c:653 @@ -437,19 +438,19 @@ msgstr "Il percors pal file di jessude temporani al è masse lunc:" msgid "Writing %s BOM.\n" msgstr "Daûr a scrivi il BOM %s.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -471,122 +472,122 @@ msgstr "Si assum codifiche UTF-16BE.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "problemis a risolvi il colegament simbolic '%s'\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " il file di jessude al reste in '%s'\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "No si è rivâts a vierzi il file di jessude temporani: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "si dopre %s tant che file temporani\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "No si è rivâts a cambiâ i permès dal file di jessude temporani %s:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "Il possès/proprietât dal utent e/o dal grup dal file %s nol è stât preservât.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "No si è rivâts a cambiâ il proprietari e il grup dal file di jessude temporani %s:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problemis a cambiâ non di '%s' a '%s':" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " che e je la destinazion dal colegament simbolic '%s'\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " il file di jessude al reste in '%s'\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "Si salte il file binari %s\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "la pagjine dai codiçs %d no je supuartade.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Si salte il file UTF-16 %s, la dimension di wchar_t e je di %d byte.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Si salte il file UTF-16 %s, si è verificât un erôr di conversion UTF-16 su la rie %u.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Si salte il file UTF-16 %s, la conversion UTF-16 no je supuartade in cheste version di %s.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Si salte %s, nol è un file regolâr.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Si salte %s, il file di jessude %s al è un colegament simbolic.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Si salte il colegament simbolic %s.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Si salte il colegament simbolic %s, la destinazion no je un file regolâr.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Si salte %s, la destinazion dal colegament simbolic %s no je un file regolâr.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "si convertìs il file %s in file %s tal formât Unix...\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "si convertìs il file %s in formât Unix...\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "si convertìs il file %s in file %s tal formât Mac...\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "si convertìs il file %s in formât Mac...\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "si convertìs il file %s in file %s tal formât DOS...\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "si convertìs il file %s in formât DOS...\n" @@ -597,7 +598,7 @@ msgstr "si convertìs il file %s in formât DOS...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "si convertìs il file %s %s in file %s %s tal formât Unix...\n" @@ -607,90 +608,90 @@ msgstr "si convertìs il file %s %s in file %s %s tal formât Unix...\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "si convertìs il file %s %s tal formât Unix di %s...\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "si convertìs il file %s %s in file %s %s tal formât Mac...\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "si convertìs il file %s %s tal formât Mac di %s...\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "si convertìs il file %s %s in file %s %s tal formât DOS...\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "si convertìs il file %s %s tal formât DOS di %s...\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "problemis tal convertî il file %s in file %s\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "problemis tal convertî il file %s\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "impussibil lei dal file di jentrade %s:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "'%c' al è un parametri sbaliât pe opzion -i o --info\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "pagjine dai codiçs ative: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "il mût di conversion specificât %s nol è valit\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "la opzion '%s' e à bisugne di un argoment\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "la codifiche di visualizazion specificade %s no je valide\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "destinazion dal file %s no specificade te modalitât gnûf-file\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "impussibil lei dal file di jentrade: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "impussibil scrivi sul file di jessude: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "erôr: cubie di surogâts no valide. Al mancje il surogât bas.\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "erôr: cubie di surogâts no valide. Al mancje il surogât alt.\n" diff --git a/dos2unix/po/hu.po b/dos2unix/po/hu.po index eab470f..4226b94 100644 --- a/dos2unix/po/hu.po +++ b/dos2unix/po/hu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" "PO-Revision-Date: 2018-01-20 12:57+0100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" @@ -154,7 +154,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown fájltulajdonjog megváltoztatásának engedélyezése\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" +#, fuzzy +msgid " -ascii default conversion mode\n" msgstr " -ascii csak sortörések átalakítása (alapértelmezett)\n" #: common.c:653 @@ -447,19 +448,19 @@ msgstr "Az átmeneti kimeneti fájl útvonala túl hosszú:" msgid "Writing %s BOM.\n" msgstr "%s BOM írása.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -481,122 +482,122 @@ msgstr "UTF-16BE kódolás feltételezése.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "hiba a(z) „%s” szimbolikus link feloldásakor\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " a kimeneti fájl itt marad: „%s”\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Nem sikerült megnyitni az átmeneti kimeneti fájlt: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "%s használata átmeneti fájlként\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Nem sikerült megváltoztatni a(z) %s átmeneti kimeneti fájl jogosultságait:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "A(z) %s fájl felhasználó és/vagy csoporttulajdonjoga nincs megtartva.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Nem sikerült megváltoztatni a(z) %s átmeneti kimeneti fájl tulajdonosát és csoportját:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "hiba a(z) „%s” átnevezésekor erre: „%s”:" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " ami a(z) „%s” szimbolikus link célja\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " a kimeneti fájl itt marad: „%s”\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "A(z) %s bináris fájl kihagyása\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "a(z) %d kódlap nem támogatott.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "A(z) %s UTF-16 fájl kihagyása, a wchar_t mérete %d bájt.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "A(z) %s UTF-16 fájl kihagyása, egy UTF-16 átalakítási hiba történt a(z) %u. sorban.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "A(z) %s UTF-16 fájl kihagyása, az UTF-16 átalakítás nem támogatott a %s ezen verziójában.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "A(z) %s kihagyása, nem egy szabályos fájl.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "A(z) %s kihagyása, a(z) %s kimeneti fájl egy szimbolikus link.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "A(z) %s szimbolikus link kihagyása.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "A(z) %s szimbolikus link kihagyása, a cél nem egy szabályos fájl.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "A(z) %s kihagyása, a(z) %s szimbolikus link célja nem egy szabályos fájl.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "a(z) %s fájl átalakítása %s fájlra Unix formátumban…\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "a(z) %s fájl átalakítása Unix formátumra…\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "a(z) %s fájl átalakítása %s fájlra Mac formátumban…\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "a(z) %s fájl átalakítása Mac formátumra…\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "a(z) %s fájl átalakítása %s fájlra DOS formátumban…\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "a(z) %s fájl átalakítása DOS formátumra…\n" @@ -607,7 +608,7 @@ msgstr "a(z) %s fájl átalakítása DOS formátumra…\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra Unix formátumban…\n" @@ -617,90 +618,90 @@ msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra Un #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású Unix formátumra…\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra Mac formátumban…\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású Mac formátumra…\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra DOS formátumban…\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású DOS formátumra…\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "hiba a(z) %s fájl %s fájlra való átalakításakor\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "hiba a(z) %s fájl átalakításakor\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "nem sikerült olvasni a(z) %s bemeneti fájlból:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "hibás „%c” jelző a -i vagy --info kapcsolókhoz\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "aktív kódlap: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "érvénytelen %s átalakítási mód lett megadva\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "a(z) „%s” kapcsolóhoz argumentum szükséges\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "érvénytelen %s megjelenítési kódolás lett megadva\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "a(z) %s fájl célja nincs megadva az új-fájl módban\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "nem sikerült olvasni a bemeneti fájlból: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "nem sikerült írni a kimeneti fájlba: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "hiba: Érvénytelen helyettesítő pár. Hiányzó alacsony helyettesítő.\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "hiba: Érvénytelen helyettesítő pár. Hiányzó magas helyettesítő.\n" diff --git a/dos2unix/po/ja.po b/dos2unix/po/ja.po index 20b2ff0..f933093 100644 --- a/dos2unix/po/ja.po +++ b/dos2unix/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" "PO-Revision-Date: 2019-08-24 15:04+0900\n" "Last-Translator: Takeshi Hamasaki \n" "Language-Team: Japanese \n" @@ -153,7 +153,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown ファイルの所有者の変更を許可します\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" +#, fuzzy +msgid " -ascii default conversion mode\n" msgstr " -ascii 改行のみ変換する (既定)\n" #: common.c:653 @@ -438,19 +439,19 @@ msgstr "一時出力ファイルのパスが長過ぎます:" msgid "Writing %s BOM.\n" msgstr "%s BOM を書き込んでいます。\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -472,122 +473,122 @@ msgstr "UTF-16BE エンコーディングと見なしています。\n" msgid "problems resolving symbolic link '%s'\n" msgstr "シンボリックリンク '%s' の解決中に問題が発生しました\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " 出力ファイルは '%s' に残っています\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "一時出力ファイルを開くのに失敗しました: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "%s を一時ファイルとして使用しています\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "一時出力ファイル %s のパーミッション変更に失敗しました:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "ファイル %s の所有者かグループまたはその両方が保持されません。\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "一時出力ファイル %s の所有者とグループの変更に失敗しました:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr " '%s' から '%s' への名前変更で問題が発生しました:" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " これはシンボリックリンク '%s' のターゲットです\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " 出力ファイルは '%s' に残っています\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "バイナリファイル %s をスキップしています\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "コードページ %d はサポートされていません\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "UTF-16 ファイル %s をスキップしています。wchar_t のサイズは %d バイトです。\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "UTF-16 ファイル %s をスキップしています。%u 行目の UTF-16 変換でエラーが発生しました。\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "UTF-16 ファイル %s をスキップしています。UTF-16 変換はこのバージョンの %s ではサポートされていません。\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "%s をスキップしています。通常ファイルではありません。\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "%s をスキップしています。出力ファイル %s はシンボリックリンクです。\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "シンボリックリンク %s をスキップしています。\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "シンボリックリンク %s をスキップしています。対象が通常ファイルではありません。\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "%s をスキップしています。シンボリックリンク %s を辿った先が通常ファイルではありません。\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "%s から %s へ Unix 形式でファイル変換しています。\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "ファイル %s を Unix 形式へ変換しています。\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "%s から %s へ Mac 形式でファイル変換しています。\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "ファイル %s を Mac 形式へ変換しています。\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "%s から %s へ DOS 形式で変換しています。\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "ファイル %s を DOS 形式へ変換しています。\n" @@ -598,7 +599,7 @@ msgstr "ファイル %s を DOS 形式へ変換しています。\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "%s ファイルの %s から %s ファイルの %s へ Unix 形式でファイル変換しています...\n" @@ -608,91 +609,91 @@ msgstr "%s ファイルの %s から %s ファイルの %s へ Unix 形式でフ #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "%s ファイル %s を %s の Unix 形式へ変換しています...\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "%s ファイルの %s から %s ファイルの %s へ Mac 形式でファイル変換しています...\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "%s ファイル %s を %s の Mac 形式へ変換しています。\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "%s ファイルの %s から %s ファイルの %s へ DOS 形式で変換しています...\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "%s ファイル %s を %s の DOS 形式へ変換しています。\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "ファイル %s からファイル %s へ変換中に問題が発生しました\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "ファイル %s 変換中に問題が発生しました。\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "入力ファイル %s から読み込めません:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "オプション -i または --info に対する間違ったフラグ '%c' です。\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "有効なコードページ: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "無効な %s 変換モードが指定されました\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "オプション '%s' には引数が必要です。\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "無効な %s 表示エンコーディングが指定されました\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "対象ファイル %s が新規ファイルモードで指定されていません\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "入力ファイルから読み込めません: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "出力ファイルに書き込めません: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "エラー: 無効なサロゲートペアです。下位サロゲートがありません。\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "エラー: 無効なサロゲートペアです。上位サロゲートがありません。\n" diff --git a/dos2unix/po/ka.po b/dos2unix/po/ka.po index e85d195..85f3633 100644 --- a/dos2unix/po/ka.po +++ b/dos2unix/po/ka.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.4.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" "PO-Revision-Date: 2023-01-15 08:42+0100\n" "Last-Translator: Temuri Doghonadze \n" "Language-Team: Georgian <(nothing)>\n" @@ -125,7 +125,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown ფაილის მფლობელის შეცვლის დაშვება\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" +#, fuzzy +msgid " -ascii default conversion mode\n" msgstr " -ascii მხოლოდ ხაზის გადატანების გადაყვანა (ნაგულისხმები)\n" #: common.c:653 @@ -410,19 +411,19 @@ msgstr "ბილიკი დროებითი გამოტანის msgid "Writing %s BOM.\n" msgstr "%s BOM-ის ჩაწერა.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -444,122 +445,122 @@ msgstr "ვთვლი, რომ კოდირება UTF-16BE-ა.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "სიმბმულის ('%s') ამოხსნის შეცდომა\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " გამოტანის ფაილი '%s'-ში დარჩება\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "დროებითი გამოტანის ფაილის შექმნის შეცდომა: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "'%s'-ის დროებით ფაილად გამოყენება\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "დროებითი გამოტანის ფაილის (%s) წვდომების შეცვლის შეცდომა:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "ფაილის (%s) მფლობელი მომხმარებელი და ჯგუფი შენარჩუნებული არ იქნება.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "დროებითი გამოტანის ფაილის (%s) მფლობელი მომხმარებლისა და ჯგუფის შეცვლის შეცდომა:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "პრობლემა '%s' -ის სახელის '%s'-ზე შეცვლისას:" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " რომელიც სიმბოლური ბმულის '%s' სამიზნეა\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " გამოტანის ფაილი '%s'-ში დარჩება\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "ბინარული ფაილის (%s) გამოტოვება\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "კოდის გვერდი %d მხარდაჭერილი არაა.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "%s-ის გამოტოვება. ის ჩვეულებრივი ფაილი არაა.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "%s: სიმბმულია. გამოტოვება.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "%s: სიმბმულია. გამოტოვება. სამიზნე ჩვეულებრივი ფაილი არაა.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "ფაილის (%s) იუნიქსის ფორმატის მქონე ფაილში (%s) გადაყვანა...\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "ფაილის (%s) იუნიქსის ფორმატში გადაყვანა...\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "ფაილის (%s) Mac-ის ფორმატის მქონე ფაილში (%s) გადაყვანა...\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "ფაილის (%s) Mac-ის ფორმატში გადაყვანა...\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "ფაილის (%s) DOS-ის ფორმატის მქონე ფაილში (%s) გადაყვანა...\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "ფაილის (%s) DOS-ის ფორმატში გადაყვანა...\n" @@ -570,7 +571,7 @@ msgstr "ფაილის (%s) DOS-ის ფორმატში გადა #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "" @@ -580,90 +581,90 @@ msgstr "" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "ფაილის (%s) გადაყვანის შეცდომა\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "შეტანის ფაილის წაკითხვის შეცდომა: %s:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "აქტიური კოდის გვერდი: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "მითითებულია არასწორი %s გადაყვანის რეჟიმი\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "პარამეტრს ('%s') არგუმენტი ესაჭიროება\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "მითითებული (%s) ჩვენების კოდირება არასწორია\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "ახალი-ფაილის რეჟიმში ფაილისთვის %s სამიზნე მითითებული არაა\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "შეტანის ფაილის წაკითხვის შეცდომა: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "გამოტანის ფაილში ჩაწერის შეცდომა: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "შეცდომა: სუროგატების არასწორი წყვილი. დაბალი სუროგატი მითითებული არაა.\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "შეცდომა: სუროგატების არასწორი წყვილი. მაღალი სუროგატი მითითებული არაა.\n" diff --git a/dos2unix/po/ko.po b/dos2unix/po/ko.po index ba8ced3..49732d0 100644 --- a/dos2unix/po/ko.po +++ b/dos2unix/po/ko.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.5.0-beta5\n" +"Project-Id-Version: dos2unix 7.5.2-beta2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" -"PO-Revision-Date: 2023-04-27 12:37+0900\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" +"PO-Revision-Date: 2023-11-13 03:50+0900\n" "Last-Translator: Seong-ho Cho \n" "Language-Team: Korean \n" "Language: ko\n" @@ -153,8 +153,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown 파일 소유권 변경을 허용합니다\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii 개행 문자만 변환합니다 (기본)\n" +msgid " -ascii default conversion mode\n" +msgstr " -ascii 기본 변환 모드\n" #: common.c:653 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" @@ -435,19 +435,19 @@ msgstr "임시 출력 경로가 너무 깁니다:" msgid "Writing %s BOM.\n" msgstr "%s BOM 기록 중.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -469,122 +469,122 @@ msgstr "UTF-16BE 인코딩으로 간주합니다.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "'%s' 심볼릭 링크 해석 문제\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " 출력 파일이 '%s'에 남았습니다\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "임시 출력 파일 열기 실패: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "%s을(를) 임시 파일로 활용\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "%s 임시 출력 파일의 권한 변경 실패:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "%s 파일의 사용자 및/또는 그룹 소유권을 유지하지 않습니다.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "%s 임시 출력 파일의 소유자 및 그룹 변경 실패:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "'%s' 이름을 '%s'(으)로 바꾸는 문제:" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " '%s' 심볼릭 링크 대상\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " 출력 파일이 '%s'에 남았습니다\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "%s 이진 파일 건너뜀\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "코드 페이지 %d번은 지원하지 않습니다.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "%s UTF-16 파일 건너뜀. wchar_t 크기는 %d 바이트입니다.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "%s UTF-16 파일 건너뜀. %u번째 행에서 UTF-16 변환 오류.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "%s UTF-16 파일 건너뜀. %s 현재 버전에서 UTF-16 변환을 지원하지 않습니다.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "%s 건너뜀. 일반 파일이 아닙니다.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "%s 건너뜀. %s 출력 파일이 심볼릭 링크입니다.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "심볼릭 링크 %s 건너뜀.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "심볼릭 링크 %s 건너뜀. 대상이 일반 파일이 아닙니다.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "%s 건너뜀. %s 심볼릭 링크 대상이 일반 파일이 아닙니다.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "%s 파일을 유닉스 형식의 %s 파일로 변환중...\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "%s 파일을 유닉스 형식으로 변환중...\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "%s 파일을 Mac 형식의 %s 파일로 변환중...\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "%s 파일을 Mac 형식으로 변환중...\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "%s 파일을 DOS 형식의 %s 파일로 변환중...\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "%s 파일을 DOS 형식으로 변환중...\n" @@ -595,7 +595,7 @@ msgstr "%s 파일을 DOS 형식으로 변환중...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "%s 파일 %s을(를) 유닉스 형식의 %s 파일 %s(으)로 변환중...\n" @@ -605,90 +605,90 @@ msgstr "%s 파일 %s을(를) 유닉스 형식의 %s 파일 %s(으)로 변환중. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "%s 파일 %s을(를) %s 유닉스 형식으로 변환중...\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "%s 파일 %s을(를) Mac 형식의 %s 파일 %s(으)로 변환중...\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "%s 파일 %s을(를) %s Mac 형식으로 변환중...\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "%s 파일 %s을(를) DOS 형식의 %s 파일 %s(으)로 변환중...\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "%s 파일 %s을(를) %s DOS 형식으로 변환중...\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "%s 파일을 %s 파일로 변환하는 문제\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "%s 파일 변환 문제\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "입력 파일을 읽을 수 없습니다 %s:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "옵션 -i 또는 --info에 대한 잘못된 플래그 '%c'\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "활성 코드 페이지: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "부적절한 %s 변환 모드를 지정했습니다\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "'%s' 옵션에 인자 값이 필요합니다\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "부적절한 %s 출력 인코딩을 지정했습니다\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "새 파일 모드의 %s 파일 대상을 지정하지 않았습니다\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "입력 파일을 읽을 수 없습니다: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "출력 파일에 기록할 수 없습니다: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "오류: 부적절한 대리 쌍. 하위 대리자가 빠졌습니다.\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "오류: 부적절한 대리 쌍. 상위 대리자가 빠졌습니다.\n" diff --git a/dos2unix/po/nb.po b/dos2unix/po/nb.po index 01a7347..3d231b2 100644 --- a/dos2unix/po/nb.po +++ b/dos2unix/po/nb.po @@ -2,14 +2,14 @@ # Copyright (C) 2015 Erwin Waterlander (msgids) # This file is distributed under the same license as the dos2unix package. # Åka Sikrom , 2015-2017. -# Johnny A. Solbu , 2023 +# Johnny A. Solbu , 2023-2024 # msgid "" msgstr "" -"Project-Id-Version: dos2unix-7.5.0-beta5\n" +"Project-Id-Version: dos2unix-7.5.2-beta2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" -"PO-Revision-Date: 2023-04-26 23:15+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" +"PO-Revision-Date: 2024-01-06 16:38+0100\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" "Language: nb\n" @@ -151,8 +151,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown tillat endring av fileierskap\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii bare konverter linjeskift (standard)\n" +msgid " -ascii default conversion mode\n" +msgstr " -ascii standard konverteringsmodus\n" #: common.c:653 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" @@ -433,19 +433,19 @@ msgstr "Sti til midlertidig utdatafil er for lang:" msgid "Writing %s BOM.\n" msgstr "Skriver «Byte Order»-merke %s.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -467,122 +467,122 @@ msgstr "Forventer UTF-16BE-koding.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "det oppstod problemer med å følge den symbolske lenka «%s»\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " utdata-fil blir liggende i «%s»\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Klarte ikke å åpne midlertidig utdata-fil: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "bruker %s som midlertidig fil\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Klarte ikke å endre rettigheter til midlertidig utdata-fil %s:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "Bruker- og/eller gruppeeierskap til fila %s blir ikke bevart.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Klarte ikke å endre eier og gruppetilhørighet for midlertidig utdata-fil %s:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "det oppstod problemer med å gi «%s» det nye navnet «%s»:" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " som den symbolske lenka «%s» peker på\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " utdata-fil blir liggende i «%s»\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "Hopper over binærfil %s\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "kodesiden %d støttes ikke.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Hopper over UTF-16-fil %s. Størrelsen på wchar_t er %d byte.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Hopper over UTF-16-fil %s. Det oppstod en UTF-16-konverteringsfeil på linje %u.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Hopper over fila %s. Konvertering av UTF-16 støttes ikke av denne versjonen av %s.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Hopper over %s, som ikke er en vanlig fil.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Hopper over %s. Utdata-fil %s er en symbolsk lenke.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Hopper over symbolsk lenke %s.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Hopper over symbolsk lenke %s. Målet er ikke en vanlig fil.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Hopper over %s. Målet for symbolsk lenke %s er ikke en vanlig fil.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "konverterer fila %s til %s i Unix-format …\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "konverterer fila %s til Unix-format …\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "konverterer fila %s til %s Mac-format …\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "konverterer fila %s til Mac-format …\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "konverterer fila %s til %s i DOS-format …\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "konverterer fila %s til DOS-format …\n" @@ -593,7 +593,7 @@ msgstr "konverterer fila %s til DOS-format …\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "konverterer %s-fila %s til %s-fila %s i Unix-format …\n" @@ -603,91 +603,91 @@ msgstr "konverterer %s-fila %s til %s-fila %s i Unix-format …\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "konverterer %s-fila %s til %s-Unix-format …\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "konverterer %s-fila %s til %s-fila %s i Mac-format …\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "konverterer %s-fila %s til %s-Mac-format …\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "konverterer %s-fila %s til %s-fila %s DOS-format …\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "konverterer %s-fila %s til %s-DOS-format …\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "det oppstod problemer under konvertering av fila %s til %s\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "det oppstod problemer under konvertering av fila %s\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "klarte ikke å lese fra inndata-fil %s:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "«%c» er et ugyldig flagg for -i (--info)\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "aktiv kodeside: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "du har valgt en ugyldig %s-konverteringsmodus\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "valget «%s» krever at du bruker et argument\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "du har valgt en ugyldig %s-koding\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "mål for fila %s er ikke valgt i ny fil-modus\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "klarte ikke å lese fra inndata-fil: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "klarte ikke å skrive til utdata-fil: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "feil: ugyldig surrogatpar. Nedre surrogat mangler.\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "feil: ugyldig surrogatpar. Øvre surrogat mangler.\n" diff --git a/dos2unix/po/nl.po b/dos2unix/po/nl.po index 90623fe..c0a0d51 100644 --- a/dos2unix/po/nl.po +++ b/dos2unix/po/nl.po @@ -6,14 +6,14 @@ # Steek hem op 'n stok! # Mep al die dekselse dictatortjes tot moes. # -# Benno Schulenberg , 2014, 2015, 2016, 2020 +# Benno Schulenberg , 2014, 2015, 2016, 2020, 2023. # Erwin Waterlander , 2009-2014. msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.3.6-beta4\n" +"Project-Id-Version: dos2unix 7.5.2-beta2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" -"PO-Revision-Date: 2020-09-27 15:17+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" +"PO-Revision-Date: 2023-12-24 10:56+0100\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -48,7 +48,7 @@ msgstr "Binair teken 0x00%02X gevonden op regel %u\n" #: dos2unix.c:237 dos2unix.c:314 dos2unix.c:445 dos2unix.c:522 unix2dos.c:210 #: unix2dos.c:281 unix2dos.c:432 unix2dos.c:503 msgid "Added line break to last line.\n" -msgstr "" +msgstr "Regeleindeteken toegevoegd aan laatste regel.\n" #: dos2unix.c:330 dos2unix.c:538 unix2dos.c:297 unix2dos.c:519 #, c-format @@ -139,108 +139,107 @@ msgstr "Gebruik: %s [opties] [bestand ...] [-n invoerbestand uitvoerbestand ... #: common.c:650 msgid " --allow-chown allow file ownership change\n" -msgstr " --allow-chown wijziging van bestandseigenaar toestaan\n" +msgstr " --allow-chown wijziging van bestandseigenaar toestaan\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii alleen regeleindes converteren (standaard)\n" +msgid " -ascii default conversion mode\n" +msgstr " -ascii alleen regeleindes converteren (standaard)\n" #: common.c:653 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" -msgstr " -iso converteren tussen de tekensets DOS en ISO-8859-1\n" +msgstr " -iso converteren tussen de tekensets DOS en ISO-8859-1\n" #: common.c:654 msgid " -1252 use Windows code page 1252 (Western European)\n" -msgstr " -1252 Windows-codetabel 1252 gebruiken (West-Europees)\n" +msgstr " -1252 Windows-codetabel 1252 gebruiken (West-Europees)\n" #: common.c:655 msgid " -437 use DOS code page 437 (US) (default)\n" -msgstr " -437 DOS-codetabel 437 gebruiken (VS) (standaard)\n" +msgstr " -437 DOS-codetabel 437 gebruiken (VS) (standaard)\n" #: common.c:656 msgid " -850 use DOS code page 850 (Western European)\n" -msgstr " -850 DOS-codetabel 850 gebruiken (West-Europees)\n" +msgstr " -850 DOS-codetabel 850 gebruiken (West-Europees)\n" #: common.c:657 msgid " -860 use DOS code page 860 (Portuguese)\n" -msgstr " -860 DOS-codetabel 860 gebruiken (Portugees)\n" +msgstr " -860 DOS-codetabel 860 gebruiken (Portugees)\n" #: common.c:658 msgid " -863 use DOS code page 863 (French Canadian)\n" -msgstr " -863 DOS-codetabel 863 gebruiken (Canadees Frans)\n" +msgstr " -863 DOS-codetabel 863 gebruiken (Canadees Frans)\n" #: common.c:659 msgid " -865 use DOS code page 865 (Nordic)\n" -msgstr " -865 DOS-codetabel 865 gebruiken (Scandinavisch)\n" +msgstr " -865 DOS-codetabel 865 gebruiken (Scandinavisch)\n" #: common.c:660 msgid " -7 convert 8 bit characters to 7 bit space\n" -msgstr " -7 lettertekens met achtste bit gezet converteren naar spaties\n" +msgstr " -7 lettertekens met achtste bit gezet converteren naar spaties\n" #: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark\n" -msgstr " -b, --keep-bom een \"Byte Order Mark\" behouden\n" +msgstr " -b, --keep-bom een \"Byte Order Mark\" behouden\n" #: common.c:664 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" -msgstr " -b, --keep-bom een \"Byte Order Mark\" behouden (standaard)\n" +msgstr " -b, --keep-bom een \"Byte Order Mark\" behouden (standaard)\n" #: common.c:665 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" msgstr "" -" -c, --convmode te gebruiken conversiemodus\n" -" MODUS 'ascii', '7bit', 'iso', of 'mac' (standaard is 'ascii')\n" +" -c, --convmode te gebruiken conversiemodus\n" +" MODUS 'ascii', '7bit', 'iso', of 'mac' (standaard is 'ascii')\n" #: common.c:668 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" msgstr "" -" -D, --display-enc te gebruiken codering voor getoonde berichten\n" -" CODERING 'ansi', 'unicode', of 'utf8' (standaard is 'ansi')\n" +" -D, --display-enc te gebruiken codering voor getoonde berichten\n" +" CODERING 'ansi', 'unicode', of 'utf8' (standaard is 'ansi')\n" #: common.c:671 -#, fuzzy msgid " -e, --add-eol add a line break to the last line if there isn't one\n" -msgstr " --no-allow-chown wijziging van bestandseigenaar niet toestaan (standaard)\n" +msgstr " -e, --add-eol een ontbrekend regeleindeteken toevoegen aan de laatste regel\n" #: common.c:672 msgid " -f, --force force conversion of binary files\n" -msgstr " -f, --force conversie van binaire bestanden afdwingen\n" +msgstr " -f, --force conversie van binaire bestanden afdwingen\n" #: common.c:675 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" -msgstr " -gb, --gb18030 UTF-16 naar GB18030 converteren\n" +msgstr " -gb, --gb18030 UTF-16 naar GB18030 converteren\n" #: common.c:678 msgid " -h, --help display this help text\n" -msgstr " -h, --help deze hulptekst tonen\n" +msgstr " -h, --help deze hulptekst tonen\n" #: common.c:679 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" msgstr "" -" -i, --info[=VLAGGEN] bestandsinformatie weergeven\n" -" BESTAND... te analyseren bestand(en)\n" +" -i, --info[=VLAGGEN] bestandsinformatie weergeven\n" +" BESTAND... te analyseren bestand(en)\n" #: common.c:681 msgid " -k, --keepdate keep output file date\n" -msgstr " -k, --keepdate tijdsstempel van uitvoerbestand behouden\n" +msgstr " -k, --keepdate tijdsstempel van uitvoerbestand behouden\n" #: common.c:682 msgid " -L, --license display software license\n" -msgstr " -L, --license softwarelicentie tonen\n" +msgstr " -L, --license softwarelicentie tonen\n" #: common.c:683 msgid " -l, --newline add additional newline\n" -msgstr " -l, --newline extra regeleinde toevoegen\n" +msgstr " -l, --newline extra regeleinde toevoegen\n" #: common.c:684 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" -msgstr " -m, --add-bom een \"Byte Order Mark\" toevoegen\n" +msgstr " -m, --add-bom een \"Byte Order Mark\" toevoegen\n" #: common.c:685 msgid "" @@ -248,25 +247,23 @@ msgid "" " infile original file in new-file mode\n" " outfile output file in new-file mode\n" msgstr "" -" -n, --newfile naar een nieuw bestand schrijven\n" -" INVOERBESTAND het originele bestand in nieuwbestand-modus\n" -" UITVOERBESTAND het geconverteerde bestand in nieuwbestand-modus\n" +" -n, --newfile naar een nieuw bestand schrijven\n" +" INVOERBESTAND het originele bestand in nieuwbestand-modus\n" +" UITVOERBESTAND het geconverteerde bestand in nieuwbestand-modus\n" #: common.c:689 msgid " --no-allow-chown don't allow file ownership change (default)\n" -msgstr " --no-allow-chown wijziging van bestandseigenaar niet toestaan (standaard)\n" +msgstr " --no-allow-chown wijziging van bestandseigenaar niet toestaan (standaard)\n" #: common.c:691 -#, fuzzy msgid " --no-add-eol don't add a line break to the last line if there isn't one (default)\n" -msgstr " --no-allow-chown wijziging van bestandseigenaar niet toestaan (standaard)\n" +msgstr " --no-add-eol geen ontbrekend regeleindeteken toevoegen aan laatste regel (standaard)\n" #: common.c:692 msgid " -O, --to-stdout write to standard output\n" -msgstr "" +msgstr " -O, --to-stdout naar standaarduitvoer schrijven\n" #: common.c:693 -#, fuzzy msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -276,55 +273,55 @@ msgstr "" #: common.c:695 msgid " -q, --quiet quiet mode, suppress all warnings\n" -msgstr " -q, --quiet alle waarschuwingen onderdrukken\n" +msgstr " -q, --quiet alle waarschuwingen onderdrukken\n" #: common.c:697 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" -msgstr " -r, --remove-bom een \"Byte Order Mark\" verwijderen (standaard)\n" +msgstr " -r, --remove-bom een \"Byte Order Mark\" verwijderen (standaard)\n" #: common.c:699 msgid " -r, --remove-bom remove Byte Order Mark\n" -msgstr " -r, --remove-bom een \"Byte Order Mark\" verwijderen\n" +msgstr " -r, --remove-bom een \"Byte Order Mark\" verwijderen\n" #: common.c:700 msgid " -s, --safe skip binary files (default)\n" -msgstr " -s, --safe binaire bestanden overslaan (standaard)\n" +msgstr " -s, --safe binaire bestanden overslaan (standaard)\n" #: common.c:702 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" -msgstr " -u, --keep-utf16 UTF-16-codering behouden\n" +msgstr " -u, --keep-utf16 UTF-16-codering behouden\n" #: common.c:703 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" -msgstr " -ul, --assume-utf16le aannemen dat de invoeropmaak UTF-16LE is\n" +msgstr " -ul, --assume-utf16le aannemen dat de invoeropmaak UTF-16LE is\n" #: common.c:704 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" -msgstr " -ub, --assume-utf16be aannemen dat de invoeropmaak UTF-16BE is\n" +msgstr " -ub, --assume-utf16be aannemen dat de invoeropmaak UTF-16BE is\n" #: common.c:706 msgid " -v, --verbose verbose operation\n" -msgstr " -v, --verbose gedetailleerde uitvoer produceren\n" +msgstr " -v, --verbose gedetailleerde uitvoer produceren\n" #: common.c:708 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" -msgstr " -F, --follow-symlink symbolische koppelingen volgen en de doelen converteren\n" +msgstr " -F, --follow-symlink symbolische koppelingen volgen en de doelen converteren\n" #: common.c:711 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" msgstr "" -" -R, --replace-symlink symbolische koppelingen vervangen door geconverteerde bestanden\n" -" (de originele doelbestanden blijven ongewijzigd)\n" +" -R, --replace-symlink symbolische koppelingen vervangen door geconverteerde bestanden\n" +" (de originele doelbestanden blijven ongewijzigd)\n" #: common.c:713 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" -msgstr " -S, --skip-symlink symbolische koppelingen en doelen ongewijzigd laten (standaard)\n" +msgstr " -S, --skip-symlink symbolische koppelingen en doelen ongewijzigd laten (standaard)\n" #: common.c:715 msgid " -V, --version display version number\n" -msgstr " -V, --version programmaversie tonen\n" +msgstr " -V, --version programmaversie tonen\n" #: common.c:727 msgid "DOS 16 bit version (WATCOMC).\n" @@ -427,19 +424,19 @@ msgstr "Pad voor tijdelijk uitvoerbestand is te lang:" msgid "Writing %s BOM.\n" msgstr "Schrijven van %s-BOM.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -461,122 +458,122 @@ msgstr "UTF-16BE-codering wordt aangenomen.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "problemen met het herleiden van symbolische koppeling '%s'\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " uitvoerbestand blijft in '%s'\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Kan tijdelijk uitvoerbestand niet openen: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "%s wordt als tijdelijk bestand gebruikt\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Kan toegangsrechten van tijdelijk uitvoerbestand %s niet wijzigen:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "De gebruiker en/of groep van bestand %s is niet behouden.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Kan eigenaar en groep van tijdelijk uitvoerbestand %s niet wijzigen:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problemen met hernoemen van '%s' naar '%s':" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " welke het doel is van symbolische koppeling '%s'\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " uitvoerbestand blijft in '%s'\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "Binair bestand %s wordt overgeslagen\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "Codetabel %d wordt niet ondersteund.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "UTF-16-bestand %s wordt overgeslagen; de grootte van 'wchar_t' is %d bytes.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "UTF-16-bestand %s wordt overgeslagen; er is een UTF-16-conversiefout opgetreden op regel %u.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "UTF-16-bestand %s wordt overgeslagen; UTF-16-conversie wordt niet ondersteund in deze versie van %s.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "%s wordt overgeslagen, omdat het geen regulier bestand is.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "%s wordt overgeslagen; uitvoerbestand %s is een symbolische koppeling.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Symbolische koppeling %s wordt overgeslagen.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Symbolische koppeling %s wordt overgeslagen, omdat het doel geen regulier bestand is.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "%s wordt overgeslagen, omdat het doel van symbolische koppeling %s geen regulier bestand is.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "converteren van bestand %s naar bestand %s in Unix-opmaak...\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "converteren van bestand %s naar Unix-opmaak...\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "converteren van bestand %s naar bestand %s in Mac-opmaak...\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "converteren van bestand %s naar Mac-opmaak...\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "converteren van bestand %s naar bestand %s in DOS-opmaak...\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "converteren van bestand %s naar DOS-opmaak...\n" @@ -587,7 +584,7 @@ msgstr "converteren van bestand %s naar DOS-opmaak...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in Unix-opmaak...\n" @@ -597,91 +594,91 @@ msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in Unix-opm #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "converteren van bestand %2$s (%1$s) naar Unix-opmaak (%3$s)...\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in Mac-opmaak...\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "converteren van bestand %2$s (%1$s) naar Mac-opmaak (%3$s)...\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in DOS-opmaak...\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "converteren van bestand %2$s (%1$s) naar DOS-opmaak (%3$s)...\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "problemen met conversie van bestand %s naar bestand %s\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "problemen met conversie van bestand %s\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "kan niet lezen uit invoerbestand %s:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "onjuiste vlag '%c' voor optie '-i' of '--info'\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "actieve codetabel: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "ongeldige conversiemodus %s opgegeven\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "optie '%s' vereist een argument\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "ongeldige weergavecodering %s opgegeven\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "doel van bestand %s is niet opgegeven in 'nieuwbestand-modus'\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "kan niet lezen uit invoerbestand: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "kan niet schrijven naar uitvoerbestand: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "fout: ongeldig surrogaatpaar -- het lage deel ontbreekt\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "fout: ongeldig surrogaatpaar -- het hoge deel ontbreekt\n" diff --git a/dos2unix/po/pl.po b/dos2unix/po/pl.po index a1926a8..7d486bc 100644 --- a/dos2unix/po/pl.po +++ b/dos2unix/po/pl.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.5.0-beta5\n" +"Project-Id-Version: dos2unix 7.5.2-beta2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" -"PO-Revision-Date: 2023-04-26 18:02+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" +"PO-Revision-Date: 2023-11-10 20:01+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "Language: pl\n" @@ -148,8 +148,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown zezwolenie na zmianę właściciela pliku\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii konwersja tylko końców linii (domyślne)\n" +msgid " -ascii default conversion mode\n" +msgstr " -ascii domyślny tryb konwersji\n" #: common.c:653 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" @@ -430,19 +430,19 @@ msgstr "Ścieżka do tymczasowego pliku wyjściowego jest zbyt długa:" msgid "Writing %s BOM.\n" msgstr "Zapis znacznika BOM %s.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -464,122 +464,122 @@ msgstr "Przyjęto kodowanie UTF-16BE.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "problemy z rozwiązaniem dowiązania symbolicznego '%s'\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " plik wyjściowy pozostaje w '%s'\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Nie udało się otworzyć tymczasowego pliku wyjściowego: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "użycie %s jako pliku tymczasowego\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Nie udało się zmienić uprawnień tymczasowego pliku wyjściowego %s:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "Właściciel i/lub grupa pliku %s nie została zachowana.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Nie udało się zmienić właściciela i grupy tymczasowego pliku wyjściowego %s:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problemy ze zmianą nazwy '%s' na '%s':" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " (czyli cel dowiązania symbolicznego '%s')\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " plik wyjściowy pozostaje w '%s'\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "Pominięto plik binarny %s\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "strona kodowa %d nie jest obsługiwana.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Pominięto plik UTF-16 %s, rozmiar wchar_t to %d bajt(y).\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Pominięto plik UTF-16 %s, wystąpił błąd konwersji UTF-16 w linii %u.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Pominięto plik UTF-16 %s, konwersja UTF-16 nie jest obsługiwana w tej wersji programu %s.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Pominięto %s, nie jest zwykłym plikiem.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Pominięto %s, plik wyjściowy %s jest dowiązaniem symbolicznym.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Pominięto dowiązanie symboliczne %s.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Pominięto dowiązanie symboliczne %s, cel nie jest zwykłym plikiem.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Pominięto %s, cel dowiązania symbolicznego %s nie jest zwykłym plikiem.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "konwersja pliku %s do pliku %s w formacie uniksowym...\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "konwersja pliku %s do formatu uniksowego...\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "konwersja pliku %s do pliku %s w formacie Mac...\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "konwersja pliku %s do formatu Mac...\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "konwersja pliku %s do pliku %s w formacie DOS...\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "konwersja pliku %s do formatu DOS...\n" @@ -590,7 +590,7 @@ msgstr "konwersja pliku %s do formatu DOS...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "konwersja pliku %s %s do pliku %s %s w formacie uniksowym...\n" @@ -600,90 +600,90 @@ msgstr "konwersja pliku %s %s do pliku %s %s w formacie uniksowym...\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "konwersja pliku %s %s do formatu uniksowego %s...\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "konwersja pliku %s %s do pliku %s %s w formacie Mac...\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "konwersja pliku %s %s do formatu Mac %s...\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "konwersja pliku %s %s do pliku %s %s w formacie DOS...\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "konwersja pliku %s %s do formatu DOS %s...\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "problemy z konwersją pliku %s do pliku %s\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "problemy z konwersją pliku %s\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "nie można czytać z pliku wejściowego %s:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "błędna flaga '%c' dla opcji -i lub --info\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "aktywna strona kodowa: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "podano błędny tryb konwersji %s\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "opcja '%s' wymaga argumentu\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "podano błędne kodowanie wyświetlania %s\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "nie podano celu pliku %s w trybie nowego pliku\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "nie można czytać z pliku wejściowego: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "nie można zapisać do pliku wyjściowego: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "błąd: Błędna para zamienna. Brak młodszego zamiennika.\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "błąd: Błędna para zamienna. Brak starszego zamiennika.\n" diff --git a/dos2unix/po/pt_BR.po b/dos2unix/po/pt_BR.po index 9d37ca6..e57604f 100644 --- a/dos2unix/po/pt_BR.po +++ b/dos2unix/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" "PO-Revision-Date: 2017-09-23 00:11-0300\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" @@ -152,7 +152,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown permite alteração da propriedade do arquivo\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" +#, fuzzy +msgid " -ascii default conversion mode\n" msgstr " -ascii converte-se apenas as quebras de linha (padrão)\n" #: common.c:653 @@ -437,19 +438,19 @@ msgstr "O caminho do arquivo de saída temporário é muito grande:" msgid "Writing %s BOM.\n" msgstr "Escrevendo %s BOM.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -471,122 +472,122 @@ msgstr "Presumo codificação UTF-16BE.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "ocorreram problemas ao determinar o link simbólico '%s'\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " o arquivo de saída permanece em '%s'\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Falha ao abrir o arquivo de saída temporário: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "usando %s como arquivo de temporário\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Falha ao alterar as permissões do arquivo de saída temporário %s:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "A propriedade de usuário e/ou grupo do arquivo %s não é preservada.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Falha ao alterar o proprietário e o grupo do arquivo de saída temporário %s:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "ocorreram problemas ao renomear '%s' para '%s':" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " que é o destino do link simbólico '%s'\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " o arquivo de saída permanece em '%s'\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "Ignorando o arquivo binário %s\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "não há suporte a página de código %d.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Ignorando o arquivo UTF-16 %s, o tamanho de wchar_t é de %d bytes.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Ignorando o arquivo UTF-16 %s, ocorreu um erro de conversão para UTF-16 na linha %u.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Ignorando o arquivo UTF-16 %s, não há suporte a conversão para UTF-16 nesta versão do %s.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Ignorando %s, não é um arquivo comum.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Ignorando %s, o arquivo de saída %s é um link simbólico.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Ignorando o link simbólico %s.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Ignorando o link simbólico %s, o destino não é o de um arquivo comum.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Ignorando %s, o destino do link simbólico %s não é o de um arquivo comum.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "convertendo o arquivo %s para arquivo %s no formato Unix...\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "convertendo o arquivo %s para formato Unix...\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "convertendo o arquivo %s para arquivo %s no formato Mac...\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "convertendo o arquivo %s para formato Mac...\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "convertendo o arquivo %s para arquivo %s no formato DOS...\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "convertendo o arquivo %s para formato DOS...\n" @@ -597,7 +598,7 @@ msgstr "convertendo o arquivo %s para formato DOS...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato Unix...\n" @@ -607,93 +608,93 @@ msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato Unix...\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "convertendo o arquivo %s %s para formato do Unix %s...\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato Mac...\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "convertendo o arquivo %s %s para formato do Mac %s...\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato DOS...\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "convertendo o arquivo %s %s para formato do DOS %s...\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "ocorreram problemas ao converter o arquivo %s para arquivo %s\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "ocorreram problemas ao converter o arquivo %s\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "não foi possível gravar no arquivo de entrada %s:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "opção incorreta \"%c\" para opção -i ou --info\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "página de código ativa: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "o modo de conversão %s especificado é inválido\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "a opção '%s' requer um argumento\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "a codificação de exibição %s especificada é inválida\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "o destino do arquivo %s não foi especificado no modo de novo arquivo\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "não foi possível ler do arquivo de saída: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "não foi possível gravar no arquivo de saída: %s\n" # "surrogate pair" é um termo do UTF-16, havendo traduções na Internet surrogate=substituto -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "erro: par de substitutos inválido. Faltando substituto baixo.\n" # "surrogate pair" é um termo do UTF-16, havendo traduções na Internet surrogate=substituto -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "erro: par de substitutos inválido. Faltando substituto alto.\n" diff --git a/dos2unix/po/ro.po b/dos2unix/po/ro.po index c42451d..72b0c76 100644 --- a/dos2unix/po/ro.po +++ b/dos2unix/po/ro.po @@ -2,20 +2,21 @@ # Copyright © 2022, 2023 Erwin Waterlander (msgids) # This file is distributed under the same license as the dos2unix package. # -# Remus-Gabriel Chelu , 2022. +# Remus-Gabriel Chelu , 2022 - 2023. # # Cronologia traducerii fișierului „dos2unix”: # Traducerea inițială, făcută de R-GC, pentru versiunea dos2unix 7.3.6-beta4, oct-2022. # Traducerea inițială, făcută de R-GC, pentru versiunea dos2unix 7.4.4-beta4, dec-2022. # Traducerea inițială, făcută de R-GC, pentru versiunea dos2unix 7.5.0-beta5, apr-2023. +# Traducerea inițială, făcută de R-GC, pentru versiunea dos2unix 7.5.2-beta2, noi-2023. # Actualizare a traducerii pentru versiunea Y, făcută de X,Y(luna-anul). # msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.5.0-beta5\n" +"Project-Id-Version: dos2unix 7.5.2-beta2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" -"PO-Revision-Date: 2023-04-26 18:05+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" +"PO-Revision-Date: 2023-11-10 15:21+0100\n" "Last-Translator: Remus-Gabriel Chelu \n" "Language-Team: Romanian \n" "Language: ro\n" @@ -151,7 +152,7 @@ msgstr "" "DAR FĂRĂ A SE LIMITA LA, ACHIZIȚIA DE BUNURI SAU SERVICII SUBSTITUENTE; PIERDERE\n" "DE UTILIZARE, DE DATE SAU DE PROFIT DE AFACERI; SAU ÎNTRERUPERE DE AFACERI)\n" "ORICUM AR FI CAUZATE ȘI CU PRIVIRE LA ORICE TEORIE A RĂSPUNDERII, FIE EA\n" -"ÎN CONTRACT, RESPONSABILITATE STRICTĂ SAU DELICTIVĂ (INCLUZÂND NEGLIJENȚA SAU\n" +"ÎN CONTRACT, RESPONSABILITATE STRICTĂ SAU DELICTUALĂ (INCLUZÂND NEGLIJENȚA SAU\n" "ORICE ALTCEVA) REZULTATE DIN ORICE MOD DE UTILIZARE AL ACESTUI SOFTWARE, CHIAR\n" "DACĂ S-A AVIZAT DE POSIBILITATEA ACESTOR PREJUDICII.\n" @@ -174,8 +175,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown permite schimbarea proprietarului fișierului\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii convertește doar întreruperile de linie (implicit)\n" +msgid " -ascii default conversion mode\n" +msgstr " -ascii modul de conversie implicit\n" #: common.c:653 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" @@ -462,19 +463,19 @@ msgstr "Calea pentru fișierul de ieșire temporar este prea lungă:" msgid "Writing %s BOM.\n" msgstr "Se scrie %s BOM.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -496,27 +497,22 @@ msgstr "Se presupune codificarea UTF-16BE.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "probleme cu rezolvarea legăturii simbolice „%s”\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " fișierul de ieșire rămâne în „%s”\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Nu s-a putut deschide fișierul de ieșire temporar: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "se folosește %s ca fișier temporar\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "A eșuat schimbarea permisiunilor fișierului de ieșire temporar %s:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "Utilizatorul și/sau grupul proprietar al fișierului %s nu este păstrat.\n" @@ -534,97 +530,102 @@ msgstr "Utilizatorul și/sau grupul proprietar al fișierului %s nu este păstra # rămîne cu această impresie... că lipsește ceva. # *** # Corecție aplicată! -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "A eșuat schimbarea utilizatorului și grupului proprietar al fișierului de ieșire temporar %s:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "probleme la redenumirea lui „%s” în „%s”:" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " care este ținta legăturii simbolice „%s”\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " fișierul de ieșire rămâne în „%s”\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "Se omite fișierul binar %s\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "pagina de cod %d nu este acceptată.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Se omite fișierul UTF-16 %s, dimensiunea lui wchar_t este de %d octeți.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Se omite fișierul UTF-16 %s, a apărut o eroare de conversie UTF-16 pe linia %u.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Se omite fișierul UTF-16 %s, conversia UTF-16 nu este acceptată în această versiune a %s.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Se omite %s, nu este un fișier obișnuit.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Se omite %s, fișierul de ieșire %s este o legătură simbolică.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Se omite legătura simbolică %s.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Se omite legătura simbolică %s, ținta nu este un fișier obișnuit.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Se omite %s, ținta legăturii simbolice %s nu este un fișier obișnuit.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "se convertește fișierul %s în fișierul %s în formatul Unix...\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "se convertește fișierul %s la formatul Unix...\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "se convertește fișierul %s în fișierul %s în formatul Mac...\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "se convertește fișierul %s la formatul Mac...\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "se convertește fișierul %s în fișierul %s în formatul DOS...\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "se convertește fișierul %s la formatul DOS...\n" @@ -635,7 +636,7 @@ msgstr "se convertește fișierul %s la formatul DOS...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "se convertește fișierul %2$s (%1$s) în fișierul %4$s (%3$s) în formatul Unix...\n" @@ -645,90 +646,90 @@ msgstr "se convertește fișierul %2$s (%1$s) în fișierul %4$s (%3$s) în form #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "se convertește fișierul %2$s (%1$s) în formatul Unix (%3$s)...\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "se convertește fișierul %2$s (%1$s) în fișierul %4$s (%3$s) în formatul Mac...\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "se convertește fișierul %2$s (%1$s) în formatul Mac (%3$s)...\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "se convertește fișierul %2$s (%1$s) în fișierul %4$s (%3$s) în formatul DOS...\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "se convertește fișierul %2$s (%1$s) în formatul DOS (%3$s)...\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "probleme la conversia fișierului %s în fișierul %s\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "probleme la conversia fișierului %s\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "nu se poate citi din fișierul de intrare %s:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "fanion greșit „%c” pentru opțiunea „-i” sau „--info”\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "pagina de cod activă: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "modul de conversie specificat %s, nu este valid\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "opțiunea „%s” necesită un argument\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "codificarea specificată pentru afișare %s, nu este validă\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "ținta fișierului %s nu este specificată în modul-fișier_nou\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "nu se poate citi din fișierul de intrare: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "nu se poate scrie în fișierul de ieșire: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "eroare: pereche surogat nevalidă -- partea inferioară lipsește\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "eroare: pereche surogat nevalidă -- partea superioară lipsește\n" diff --git a/dos2unix/po/ru.po b/dos2unix/po/ru.po index 46eb7e6..ead7410 100644 --- a/dos2unix/po/ru.po +++ b/dos2unix/po/ru.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the dos2unix package. # # Andrei Uhlik , 2013. -# Yuri Kozlov , 2014, 2015, 2016, 2017. +# Yuri Kozlov , 2014, 2015, 2016, 2017, 2023. msgid "" msgstr "" -"Project-Id-Version: dos2unix-7.3.6-beta4\n" +"Project-Id-Version: dos2unix-7.5.2-beta2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" -"PO-Revision-Date: 2017-09-23 09:19+0300\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" +"PO-Revision-Date: 2023-11-10 18:10+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "Language: ru\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 22.12.3\n" #: dos2unix.c:79 #, c-format @@ -45,7 +45,7 @@ msgstr "В строке %2$u обнаружен двоичный символ 0x #: dos2unix.c:237 dos2unix.c:314 dos2unix.c:445 dos2unix.c:522 unix2dos.c:210 #: unix2dos.c:281 unix2dos.c:432 unix2dos.c:503 msgid "Added line break to last line.\n" -msgstr "" +msgstr "Добавлен разрыв строки в последнюю строку.\n" #: dos2unix.c:330 dos2unix.c:538 unix2dos.c:297 unix2dos.c:519 #, c-format @@ -152,8 +152,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown разрешить смену владельца файла\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii преобразовать только конец строки (по умолчанию)\n" +msgid " -ascii default conversion mode\n" +msgstr " -ascii режим преобразования по умолчанию\n" #: common.c:653 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" @@ -212,9 +212,8 @@ msgstr "" " encoding ansi, unicode, utf8, по умолчанию ansi\n" #: common.c:671 -#, fuzzy msgid " -e, --add-eol add a line break to the last line if there isn't one\n" -msgstr " --no-allow-chown не разрешать смену владельца файла (по умолчанию)\n" +msgstr " -e, --add-eol добавить разрыв строки в последнюю строку, если его нет\n" #: common.c:672 msgid " -f, --force force conversion of binary files\n" @@ -267,16 +266,16 @@ msgid " --no-allow-chown don't allow file ownership change (default)\n" msgstr " --no-allow-chown не разрешать смену владельца файла (по умолчанию)\n" #: common.c:691 -#, fuzzy msgid " --no-add-eol don't add a line break to the last line if there isn't one (default)\n" -msgstr " --no-allow-chown не разрешать смену владельца файла (по умолчанию)\n" +msgstr "" +" --no-add-eol не добавлять разрыв строки в последнюю строку,\n" +" если его нет (по умолчанию)\n" #: common.c:692 msgid " -O, --to-stdout write to standard output\n" -msgstr "" +msgstr " -O, --to-stdout писать в стандартный выходной поток\n" #: common.c:693 -#, fuzzy msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -437,19 +436,19 @@ msgstr "Слишком длинный путь для временного вы msgid "Writing %s BOM.\n" msgstr "Записывается %s BOM.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -471,122 +470,122 @@ msgstr "Предполагается кодировка UTF-16BE.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "конфликт при разрешении символической ссылки «%s»\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " выходной файл остаётся в «%s»\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Не удалось открыть временный выходной файл: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "использование %s в качестве временного файла\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Не удалось изменить права доступа ко временному выходному файлу %s:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "Владелец и группа файла %s не сохраняется.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Не удалось изменить владельца и группу временного выходного файла %s:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "проблемы при переименовании «%s» в «%s»:" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " который является целью символической ссылки «%s»\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " выходной файл остаётся в «%s»\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "Пропуск двоичного файла %s\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "кодовая страница %d не поддерживается.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Пропуск файла %s с UTF-16, размер wchar_t составляет %d байт.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Пропуск файла %s с UTF-16, возникла ошибка преобразования UTF-16 в строке %u.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Пропуск файла %s с UTF-16, преобразование UTF-16 не поддерживается в этой версии %s.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Пропуск %s, не является обычным файлом.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Пропуск %s, выходной файл %s является символической ссылкой.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Пропуск символической ссылки %s.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Пропуск символической ссылки %s, цель не является обычным файлом.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Пропуск %s, цель символической ссылки %s не является обычным файлом.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "преобразование файла %s в файл %s в формат Unix…\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "преобразование файла %s в формат Unix…\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "преобразование файла %s в файл %s в формат Mac…\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "преобразование файла %s в формат Mac…\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "преобразование файла %s в файл %s в формат DOS…\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "преобразование файла %s в формат DOS…\n" @@ -597,7 +596,7 @@ msgstr "преобразование файла %s в формат DOS…\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "преобразование %s из файла %s в %s (файл %s) в формат Unix…\n" @@ -607,91 +606,91 @@ msgstr "преобразование %s из файла %s в %s (файл %s) #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "преобразование %s из файла %s в %s формат Unix…\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "преобразование %s из файла %s в %s (файл %s) в формат Mac…\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "преобразование %s из файла %s в %s формат Mac…\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "преобразование %s из файла %s в %s (файл %s) в формат DOS…\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "преобразование %s из файла %s в %s формат DOS…\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "проблемы при преобразовании файла %s в файл %s\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "проблемы при преобразовании файла %s\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "не удалось прочитать из входного файла %s:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "некорректный флаг «%c» для параметра -i или --info\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "активная кодовая страница: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "задан неправильный %s режим преобразования\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "для параметра «%s» требуется аргумент\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "задана неправильная кодировка отображения (%s)\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "цель файла %s не задана в режиме нового файла\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "не удалось прочитать из входного файла: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "не удалось записать в выходной файл: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "ошибка: некорректная суррогатная пара. Отсутствует младший суррогат.\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "ошибка: некорректная суррогатная пара. Отсутствует старший суррогат.\n" diff --git a/dos2unix/po/sr.po b/dos2unix/po/sr.po index 4b50305..9e4ad30 100644 --- a/dos2unix/po/sr.po +++ b/dos2unix/po/sr.po @@ -1,13 +1,14 @@ # Serbian translation for dos2unix. # Copyright © 2020 Erwin Waterlander (msgids) # This file is distributed under the same license as the dos2unix package. -# Мирослав Николић , 2014-2023. +# Мирослав Николић , 2014-2024. +# msgid "" msgstr "" -"Project-Id-Version: dos2unix-7.5.0-beta5\n" +"Project-Id-Version: dos2unix-7.5.2-beta2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" -"PO-Revision-Date: 2023-05-18 12:28+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" +"PO-Revision-Date: 2024-01-10 08:23+0100\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" "Language: sr\n" @@ -15,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Gtranslator 41.0\n" "X-Bugs: Report translation errors to the Language-Team address.\n" #: dos2unix.c:79 @@ -145,8 +146,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown допушта промену власништва датотеке\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii претвара само прекиде реда (основно)\n" +msgid " -ascii default conversion mode\n" +msgstr " -ascii основни режим претварања\n" #: common.c:653 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" @@ -427,19 +428,19 @@ msgstr "Путања за привремену излазну датотеку msgid "Writing %s BOM.\n" msgstr "Записујем %s НПБ-а.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "УТФ-16ЛЕ" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "УТФ-16БЕ" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "ГБ18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "УТФ-8" @@ -461,122 +462,122 @@ msgstr "Подразумевам УТФ-16БЕ кодирање.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "проблеми решавања симболичке везе „%s“\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " излазна датотека остаје у „%s“\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Нисам успео да отворим привремену излазну датотеку: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "користим „%s“ као привремену датотеку\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Нисам успео да изменим овлашћења привремене излазне датотеке „%s“:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "Власништво датотеке корисника и/или групе „%s“ није очувано.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Нисам успео да изменим власника и групу привремене излазне датотеке „%s“:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "проблеми преименовања „%s“ у „%s“:" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " који је мета симболичке везе „%s“\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " излазна датотека остаје у „%s“\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "Прескачем бинарну датотеку „%s“\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "Кодна страница „%d“ није подржана.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Прескачем УТФ-16 датотеку „%s“, величина „wchar_t“-а је %d бајта.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Прескачем УТФ-16 датотеку „%s“, дошло је од грешке УТФ-16 претварања у %u. реду.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Прескачем УТФ-16 датотеку „%s“, УТФ-16 претварање није подржано у овом издању „%s“.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Прескачем „%s“, није обична датотека.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Прескачем „%s“, излазна датотека „%s“ је симболичка веза.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Прескачем симболичку везу „%s“.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Прескачем симболичку везу „%s“, мета није обична датотека.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Прескачем „%s“, мета симболичке везе „%s“ није обична датотека.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "претварам датотеку „%s“ у датотеку „%s“ у запису Јуникса...\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "претварам датотеку „%s“ у запису Јуникса...\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "претварам датотеку „%s“ у датотеку „%s“ у запису Мека...\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "претварам датотеку „%s“ у запису Мека...\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "претварам датотеку „%s“ у датотеку „%s“ у запису ДОС-а...\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "претварам датотеку „%s“ у запису ДОС-а...\n" @@ -587,7 +588,7 @@ msgstr "претварам датотеку „%s“ у запису ДОС-а.. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Јуникса...\n" @@ -597,91 +598,91 @@ msgstr "претварам %s датотеку „%s“ у %s датотеку #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "претварам %s датотеку „%s“ у %s запис Јуникса...\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Мека...\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "претварам %s датотеку „%s“ у %s запис Мека...\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Дос-а...\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "претварам %s датотеку „%s“ у %s запис Дос-а...\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "проблеми претварања датотеке „%s“ у датотеку „%s“\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "проблеми претварања датотеке „%s“\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "не могу да читам из улазне датотеке „%s“:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "погрешна заставица „%c“ за опцију „-i“ или „--info“\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "радна кодна страница: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "наведен је неисправан „%s“ режим претварања\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "опција „%s“ захтева аргумент\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "наведено је неисправно кодирање „%s“ приказа\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "мета датотеке „%s“ није наведена у режиму нове датотеке\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "не могу да читам из улазне датотеке: „%s“\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "не могу да пишем у излазну датотеку: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "грешка: Неисправан пар надометка. Недостаје нижи надометак.\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "грешка: Неисправан пар надометка. Недостаје виши надометак.\n" diff --git a/dos2unix/po/sv.po b/dos2unix/po/sv.po index ea868ae..22b8544 100644 --- a/dos2unix/po/sv.po +++ b/dos2unix/po/sv.po @@ -1,14 +1,15 @@ # Swedish translation for dos2unix. -# Copyright © 2014, 2015, 2016, 2017, 2023 Erwin Waterlander (msgids) +# Copyright © 2014, 2015, 2016, 2017, 2023, 2024 Erwin Waterlander (msgids) # This file is distributed under the same license as the dos2unix package. -# Sebastian Rasmussen , 2014, 2015, 2016, 2017, 2023. +# Luna Jernberg , 2023. +# Sebastian Rasmussen , 2014, 2015, 2016, 2017, 2023, 2024. # msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.5.0-beta5\n" +"Project-Id-Version: dos2unix 7.5.2-beta2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" -"PO-Revision-Date: 2023-04-26 17:21+0200\n" +"POT-Creation-Date: 2024-01-18 22:13+0100\n" +"PO-Revision-Date: 2024-01-17 12:41+0100\n" "Last-Translator: Sebastian Rasmussen \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -16,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 3.2.2\n" +"X-Generator: Poedit 3.4.2\n" #: dos2unix.c:79 #, c-format @@ -152,8 +153,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown tillåt ändring av ägarskap för fil\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii konvertera bara radbrytningar (standard)\n" +msgid " -ascii default conversion mode\n" +msgstr " -ascii standardkonverteringsläge\n" #: common.c:653 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" @@ -434,19 +435,19 @@ msgstr "Sökväg för temporär utmatningsfil är för lång:" msgid "Writing %s BOM.\n" msgstr "Skriver %s BOM.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -468,122 +469,122 @@ msgstr "Förmodar att UTF-16BE teckenkodning används.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "fel uppstod vid upplösning av symbolisk länk ”%s”\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " utfil förblir i ”%s”\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Misslyckades att öppna temporär utmatningsfil: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "använder %s som temporär fil\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Misslyckades att ändra rättigheterna för temporär utmatningsfil %s:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "Användar- och/eller gruppägarskap för fil %s bevaras inte.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Misslyckades att ändra ägare och grupp för temporär utmatningsfil %s:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "fel när '%s' bytte namn till '%s':" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " vilken är målet för den symboliska länken ”%s”\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " utfil förblir i ”%s”\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "Hoppar över binärfil %s\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "saknar stöd för teckentabell %d.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Hoppar över UTF-16-fil %s, storleken på wchar_t är %d byte.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Hoppar över UTF-16-fil %s, ett UTF-16-konverteringsfel inträffade på rad %u.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Hoppar över UTF-16-fil %s, UTF-16-konvertering saknar stöd i denna version av %s.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Hoppar över %s, är ingen vanlig fil.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Hoppar över %s, utfil %s är en symbolisk länk.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Hoppar över symbolisk länk %s.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Hoppar över symbolisk länk %s, målet är inte en vanlig fil.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Hoppar över %s, målet för den symboliska länken %s är inte en vanlig fil.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "konverterar fil %s till fil %s i Unix-format…\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "konverterar fil %s till Unix-format…\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "konverterar fil %s till fil %s i Mac-format…\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "konverterar fil %s till Mac-format…\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "konverterar fil %s till fil %s i DOS-format…\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "konverterar fil %s till DOS-format…\n" @@ -594,7 +595,7 @@ msgstr "konverterar fil %s till DOS-format…\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "konverterar %s-fil %s till %s-fil %s i Unix-format…\n" @@ -604,90 +605,90 @@ msgstr "konverterar %s-fil %s till %s-fil %s i Unix-format…\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "konverterar %s-fil %s till %s Unix-format…\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "konverterar %s-fil %s till %s-fil %s i Mac-format…\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "konverterar %s-fil %s till %s Mac-format…\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "konverterar %s-fil %s till %s-fil %s i DOS-format…\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "konverterar %s-fil %s till %s DOS-format…\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "fel vid konvertering från fil %s till fil %s\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "fel vid konvertering av fil %s\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "kan inte läsa från inmatningsfil %s:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "felaktig flagga '%c' för argumentet -i eller --info\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "aktiv teckentabell: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "ogiltigt konverteringsläge %s angivet\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "flaggan ”%s” kräver ett argument\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "ogiltig %s-kodning angiven\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "målet för fil %s specificerades inte i nyfilsläge\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "kan inte läsa från inmatningsfil: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "kan inte skriva till utfil: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "fel: Ogiltigt surrogatpar. Den lägre delen av surrogatparet saknas.\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "fel: Ogiltigt surrogatpar. Den högre delen av surrogatparet saknas.\n" diff --git a/dos2unix/po/uk.po b/dos2unix/po/uk.po index c300c78..10fad8e 100644 --- a/dos2unix/po/uk.po +++ b/dos2unix/po/uk.po @@ -6,10 +6,10 @@ # Yuri Chornoivan , 2014, 2015, 2016, 2017, 2020, 2023. msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.5.0-beta5\n" +"Project-Id-Version: dos2unix 7.5.2-beta2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" -"PO-Revision-Date: 2023-04-26 20:58+0300\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" +"PO-Revision-Date: 2023-11-10 16:55+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -159,8 +159,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown дозволити зміну власника файла\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii перетворити лише символи розриву рядків (типово)\n" +msgid " -ascii default conversion mode\n" +msgstr " -ascii типовий режим перетворення\n" #: common.c:653 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" @@ -441,19 +441,19 @@ msgstr "Шлях до тимчасового файла виведення є н msgid "Writing %s BOM.\n" msgstr "Записуємо позначку порядку байтів %s.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -475,122 +475,122 @@ msgstr "Припускаємо кодування UTF-16BE.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "проблеми з обробкою символічного посилання «%s»\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " файл результатів залишився у «%s»\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Не вдалося відкрити файл для виведення тимчасових даних: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "використовуємо %s як тимчасовий файл\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Не вдалося змінити права доступу до тимчасового файла виведення даних %s:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "Параметри належності користувачу і/або групі для файла %s не збережено.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Не вдалося змінити власника і групу тимчасового файла виведення даних %s:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "проблеми з перейменуванням «%s» на «%s»:" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " на який посилається символічне посилання «%s»\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " файл результатів залишився у «%s»\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "Пропускаємо двійковий файл %s\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "підтримки кодової сторінки %d не передбачено.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Пропускаємо файл у кодуванні UTF-16, %s, розміром wchar_t є %d байтів.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Пропускаємо файл у кодуванні UTF-16, %s, сталася помилка під час перетворення даних UTF-16 у рядку %u.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Пропускаємо файл у кодуванні UTF-16, %s, перетворення UTF-16 для цієї версії %s не передбачено.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Пропускаємо %s, не є звичайним файлом.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Пропускаємо %s, файл результату, %s, є символічним посиланням.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Пропускаємо символічне посилання %s.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Пропускаємо символічне посилання %s, призначення не є звичайним файлом.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Пропускаємо %s, об’єкт, на який посилається символічне посилання %s, не є звичайним файлом.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "перетворюємо файл %s на файл %s у форматі Unix...\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "перетворюємо файл %s до формату Unix...\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "перетворюємо файл %s на файл %s у форматі Mac...\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "перетворюємо файл %s до формату Mac...\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "перетворюємо файл %s на файл %s у форматі DOS...\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "перетворюємо файл %s до формату DOS...\n" @@ -601,7 +601,7 @@ msgstr "перетворюємо файл %s до формату DOS...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі Unix...\n" @@ -611,91 +611,91 @@ msgstr "перетворюємо файл у кодуванні %s %s на фа #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "перетворюємо файл у кодуванні %s %s до формату %s Unix...\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі Mac...\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "перетворюємо файл у кодуванні %s %s до формату %s Mac...\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі DOS...\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "перетворюємо файл у кодуванні %s %s до формату %s DOS...\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "під час перетворення файла %s на файл %s виникли проблеми\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "під час перетворення файла %s виникли проблеми\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "не вдалося прочитати дані із файла вхідних даних %s:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "помилковий прапорець «%c» для параметра -i або --info\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "активна кодова сторінка: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "вказано некоректний режим перетворення %s\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "до параметра «%s» слід вказувати аргумент\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "вказано некоректне кодування для показу %s\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "не вказано призначення для файла %s у режимі створення файлів\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "не вдалося прочитати дані із файла вхідних даних: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "не вдалося виконати запис до файла результатів: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "помилка: некоректна пара заміщення. Пропущено нижній компонент.\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "помилка: некоректна пара заміщення. Пропущено верхній компонент.\n" diff --git a/dos2unix/po/vi.po b/dos2unix/po/vi.po index 17e2edc..879d6fc 100644 --- a/dos2unix/po/vi.po +++ b/dos2unix/po/vi.po @@ -1,14 +1,14 @@ # Vietnamese translations for dos2unix package # Bản dịch tiếng Việt cho gói dos2unix. # This file is distributed under the same license as the dos2unix package. -# Trần Ngọc Quân , 2014-2017, 2023. +# Trần Ngọc Quân , 2014-2023. # msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.5.0-beta5\n" +"Project-Id-Version: dos2unix 7.5.2-beta2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" -"PO-Revision-Date: 2023-04-29 07:52+0700\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" +"PO-Revision-Date: 2023-11-19 09:23+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" "Language: vi\n" @@ -16,7 +16,8 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Gtranslator 42.0\n" #: dos2unix.c:79 #, c-format @@ -138,12 +139,12 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown cho phép thay đổi chủ sở hữu tập tin\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii chỉ chuyển đổi các ngắt dòng (mặc định)\n" +msgid " -ascii default conversion mode\n" +msgstr " -ascii chế độ chuyển đổi mặc định\n" #: common.c:653 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" -msgstr " -iso chuyển đổi giữa DOS và ISO-8859-1\n" +msgstr " -iso chuyển đổi bộ ký tự giữa DOS và ISO-8859-1\n" #: common.c:654 msgid " -1252 use Windows code page 1252 (Western European)\n" @@ -420,19 +421,19 @@ msgstr "Đường dẫn cho tập tin xuất tạm quá dài:" msgid "Writing %s BOM.\n" msgstr "Đang ghi %s BOM.\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -454,122 +455,122 @@ msgstr "Coi là bảng mã UTF-16BE.\n" msgid "problems resolving symbolic link '%s'\n" msgstr "gặp lỗi khi phân giải liên kết mềm “%s”\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " tập tin đầu ra còn trong “%s”\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Gặp lỗi khi mở tập tin đầu ra tạm thời: %s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "đang dùng %s làm tập tin tạm\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Gặp lỗi khi thay đổi quyền hạn của tập tin đầu ra tạm %s:" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "Người dùng và nhóm sở hữu của tập tin %s không được giữ nguyên.\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Gặp lỗi khi đổi chủ sở hữu và nhóm của tập tin đầu ra tạm %s:" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "gặp lỗi khi đổi tên “%s” thành “%s”:" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " cái là đích của liên kết mềm “%s”\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " tập tin đầu ra còn trong “%s”\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "Bỏ qua tập tin nhị phân %s\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "không hỗ trợ trang mã %d.\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Bỏ qua tập tin UTF-16 %s, cỡ của wchar_t không phải là %d byte.\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Bỏ qua tập tin UTF-16 %s, đã xảy ra lỗi chuyển đổi UTF-16 trên dòng %u.\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Bỏ qua tập tin UTF-16 %s, chuyển đổi UTF-16 không được hỗ trợ ở phiên bản này của %s.\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Bỏ qua %s, đây không phải là tập tin thường.\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Bỏ qua %s, tập tin đầu ra %s là một liên kết mềm.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Bỏ qua liên kết mềm %s.\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Bỏ qua liên kết mềm %s, đích của nó không phải là một tập tin thường.\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Bỏ qua liên kết mềm %s, đích %s của liên kết mềm không phải là một tập tin thường.\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "Đang chuyển đổi tập tin %s thành tập tin “%s” theo định dạng Unix…\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "Đang chuyển đổi tập tin “%s” sang định dạng Unix…\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "Đang chuyển đổi tập tin “%s” thành tập tin “%s” theo định dạng Mac…\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "Đang chuyển đổi tập tin “%s” sang định dạng Mac…\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "Đang chuyển đổi tập tin “%s” thành tập tin “%s” theo định dạng DOS…\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "Đang chuyển đổi tập tin “%s” sang định dạng DOS…\n" @@ -580,7 +581,7 @@ msgstr "Đang chuyển đổi tập tin “%s” sang định dạng DOS…\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng Unix %s…\n" @@ -590,91 +591,91 @@ msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” th #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "Đang chuyển đổi tập tin %s “%s” sang định dạng Unix %s…\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng Mac %s…\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "Đang chuyển đổi tập tin %s “%s” sang định dạng Mac %s…\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng DOS %s…\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "Đang chuyển đổi tập tin %s “%s” sang định dạng DOS %s…\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "Đang chuyển đổi tập tin %s thành tập tin %s\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "gặp trục trặc khi chuyển đổi tập tin %s\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "không thể đọc từ tập tin đầu vào %s:" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "cờ “%c” cho tùy chọn -i hay --info bị sai\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "trang mã đang hoạt động: %d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "đã đưa ra chế độ chuyển đổi %s không hợp lệ\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "tùy chọn “%s” yêu cầu một đối số\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "đã đưa ra bảng mã hiển thị không hợp lệ %s\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "đích của tập tin %s không được chỉ định trong chế độ tập-tin-mới\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "không thể đọc từ tập tin đầu vào: %s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "không thể ghi vào tập tin đầu ra: %s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "lỗi: Cặp thay thế không hợp lệ. Thiếu cái thay thế dưới.\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "lỗi: Cặp thay thế không hợp lệ. Thiếu cái thay thế trên.\n" diff --git a/dos2unix/po/zh_CN.po b/dos2unix/po/zh_CN.po index 31389c9..2afb6cf 100644 --- a/dos2unix/po/zh_CN.po +++ b/dos2unix/po/zh_CN.po @@ -2,21 +2,22 @@ # This file is distributed under the same license as the dos2unix package. # # Tianze Wang , 2015. +# Boyuan Yang <073plan@gmail.com>, 2023. msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.5.0-beta5\n" +"Project-Id-Version: dos2unix 7.5.2-beta2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 18:26+0200\n" -"PO-Revision-Date: 2023-06-02 15:33+0800\n" -"Last-Translator: Tianze Wang \n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" +"PO-Revision-Date: 2023-11-10 13:52-0500\n" +"Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 2.2.1\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" +"X-Generator: Poedit 3.4.1\n" #: dos2unix.c:79 #, c-format @@ -150,8 +151,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown 允许修改文件所有者\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii 只转换换行符（默认）\n" +msgid " -ascii default conversion mode\n" +msgstr " -ascii 默认转换模式\n" #: common.c:653 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" @@ -432,19 +433,19 @@ msgstr "临时输出" msgid "Writing %s BOM.\n" msgstr "写入 %s BOM。\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -466,122 +467,122 @@ msgstr "假定为UTF-16BE编码。\n" msgid "problems resolving symbolic link '%s'\n" msgstr "解析符号链接“%s”遇到问题\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " 输出文件“%s”未改变\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "打开临时输出文件 %s 失败\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "使用 %s 作为临时文件\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "改变临时输出文件 %s 的权限失败：" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "文件 %s 的属主和/或属组已改变。\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "改变临时输出文件 %s 的所有者和群组失败：" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "重新命名“%s”到“%s”错误：" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " 後者为符号链接'%s' 的目标\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " 输出文件“%s”未改变\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "跳过二进制文件%s\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "不支持编码页 %d。\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "跳过 UTF-16 文件 %s，wchar_t 的大小为 %d 位。\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "跳过 UTF-16 文件 %s，UTF-16 转换发生错误于第 %u 行。\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "跳过 UTF-16 文件 %s，本版本 %s 不支持UTF-16。\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "跳过 %s，不是一个普通文件。\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "跳过 %s，输出文件 %s 是一个符号链接。.\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "跳过符号链接 %s。\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "跳过符号链接 %s，目标不是一个普通文件。\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "跳过 %s，符号链接 %s 目标不是一个普通文件。\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "正在转换文件 %s 为Unix格式到 %s...\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "正在转换文件 %s 为Unix格式...\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "正在转换文件 %s 为Mac格式到 %s...\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "正在转换文件 %s 为Mac格式...\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "正在转换文件 %s 为DOS格式到 %s...\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "正在转换文件 %s 为DOS格式...\n" @@ -592,7 +593,7 @@ msgstr "正在转换文件 %s 为DOS格式...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "正在转换 %1$s 文件 %2$s 为Unix格式的 %3$s 文件 %4$s...\n" @@ -602,91 +603,91 @@ msgstr "正在转换 %1$s 文件 %2$s 为Unix格式的 %3$s 文件 %4$s...\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "正在转换 %s 文件 %s 为Unix格式的 %s 文件...\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "正在转换 %1$s 文件 %2$s 为Mac格式的 %3$s 文件 %4$s...\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "正在转换 %s 文件 %s 为Mac格式的 %s 文件...\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "正在转换 %1$s 文件 %2$s 为DOS格式的 %3$s 文件 %4$s...\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "正在转换 %s 文件 %s 为DOS格式的 %s 文件...\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "转换文件 %s 到 %s 错误\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "转换文件 %s 出错\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "无法读取输入文件 %s：" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "-i/--info选项的标志“%c”错误\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "作用中编码页：%d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "指定的转换模式 %s 不合法\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "选项“%s”需要一个参数\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "指定了无效的显示编码 %s\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "新文件模式中未指明文件 %s 的目的位置\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "无法读取输入文件：%s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "无法写入输出文件：%s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "错误：无效的代理对。缺少低位字符。\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "错误：无效的代理对。缺少高位字符。\n" diff --git a/dos2unix/po/zh_TW.po b/dos2unix/po/zh_TW.po index 9d040d6..5c93839 100644 --- a/dos2unix/po/zh_TW.po +++ b/dos2unix/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.5.0-beta5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-01 22:23+0200\n" +"POT-Creation-Date: 2024-01-16 19:49+0100\n" "PO-Revision-Date: 2023-05-23 13:06+0800\n" "Last-Translator: Yi-Jyun Pan \n" "Language-Team: Chinese (traditional) \n" @@ -147,7 +147,8 @@ msgid " --allow-chown allow file ownership change\n" msgstr " --allow-chown 允許變更檔案擁有者\n" #: common.c:652 -msgid " -ascii convert only line breaks (default)\n" +#, fuzzy +msgid " -ascii default conversion mode\n" msgstr " -ascii 只轉換換行字元 (預設)\n" #: common.c:653 @@ -429,19 +430,19 @@ msgstr "暫存輸出檔案路徑過長：" msgid "Writing %s BOM.\n" msgstr "正在寫入 %s BOM。\n" -#: common.c:1201 common.c:1254 common.c:1878 common.c:1899 +#: common.c:1201 common.c:1254 common.c:1877 common.c:1898 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1208 common.c:1257 common.c:1880 common.c:1901 +#: common.c:1208 common.c:1257 common.c:1879 common.c:1900 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1215 common.c:1234 common.c:1263 common.c:1891 +#: common.c:1215 common.c:1234 common.c:1263 common.c:1890 msgid "GB18030" msgstr "GB18030" -#: common.c:1222 common.c:1241 common.c:1260 common.c:1893 +#: common.c:1222 common.c:1241 common.c:1260 common.c:1892 msgid "UTF-8" msgstr "UTF-8" @@ -463,122 +464,122 @@ msgstr "假設 UTF-16BE 編碼方式。\n" msgid "problems resolving symbolic link '%s'\n" msgstr "解析符號連結 '%s' 發生問題\n" -#: common.c:1522 common.c:1705 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " 輸出檔案 '%s' 未改變\n" - -#: common.c:1540 +#: common.c:1539 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "無法開啟暫存輸出檔案：%s\n" -#: common.c:1552 +#: common.c:1551 #, c-format msgid "using %s as temporary file\n" msgstr "使用 %s 作為暫存檔\n" -#: common.c:1604 common.c:1632 +#: common.c:1603 common.c:1631 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "無法變更暫存輸出檔案 %s 的權限：" -#: common.c:1620 +#: common.c:1619 #, c-format msgid "The user and/or group ownership of file %s is not preserved.\n" msgstr "不會保留 %s 檔案的使用者及/或群組所有權。\n" -#: common.c:1642 +#: common.c:1641 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "無法變更暫存輸出檔案 %s 的擁有者及群組：" -#: common.c:1699 +#: common.c:1698 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "重命名 '%s' 至 '%s' 時發生問題：" -#: common.c:1703 +#: common.c:1702 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " 後者為符號連結 '%s' 的目標\n" -#: common.c:1853 common.c:1948 +#: common.c:1704 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " 輸出檔案 '%s' 未改變\n" + +#: common.c:1852 common.c:1947 #, c-format msgid "Skipping binary file %s\n" msgstr "略過二進位檔案 %s\n" -#: common.c:1856 common.c:1951 +#: common.c:1855 common.c:1950 #, c-format msgid "code page %d is not supported.\n" msgstr "未支援 %d 編碼頁。\n" -#: common.c:1860 common.c:1955 common.c:2043 +#: common.c:1859 common.c:1954 common.c:2042 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "略過 UTF-16 檔案 %s，wchar_t 的大小是 %d 位元組。\n" -#: common.c:1863 common.c:1958 +#: common.c:1862 common.c:1957 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "跳過 %s UTF-16 檔案，第 %u 行發生 UTF-16 轉換錯誤。\n" -#: common.c:1867 common.c:1962 +#: common.c:1866 common.c:1961 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "跳過 %s UTF-16 檔案，這個版本的 %s 不支援 UTF-16 轉換。\n" -#: common.c:1933 common.c:2032 +#: common.c:1932 common.c:2031 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "略過 %s，不是一個普通檔案。\n" -#: common.c:1937 +#: common.c:1936 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "略過 %s，輸出檔 %s 是一個符號連結。\n" -#: common.c:1939 +#: common.c:1938 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "略過符號連結 %s。\n" -#: common.c:1942 common.c:2037 +#: common.c:1941 common.c:2036 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "略過符號連結 %s，目標不是一個普通檔案。\n" -#: common.c:1945 +#: common.c:1944 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "略過 %s，符號連結 %s 目標不是一個普通檔案。\n" -#: common.c:1970 +#: common.c:1969 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "正在轉換 %s 至 Unix 格式的 %s...\n" -#: common.c:1972 +#: common.c:1971 #, c-format msgid "converting file %s to Unix format...\n" msgstr "正在轉換 %s 至 Unix 格式...\n" -#: common.c:1976 +#: common.c:1975 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "正在轉換 %s 至 Mac 格式的 %s...\n" -#: common.c:1978 +#: common.c:1977 #, c-format msgid "converting file %s to Mac format...\n" msgstr "正在轉換 %s 至 Mac 格式...\n" -#: common.c:1981 +#: common.c:1980 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "正在轉換 %s 至 DOS 格式的 %s...\n" -#: common.c:1983 +#: common.c:1982 #, c-format msgid "converting file %s to DOS format...\n" msgstr "正在轉換 %s 至 DOS 格式...\n" @@ -589,7 +590,7 @@ msgstr "正在轉換 %s 至 DOS 格式...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1995 +#: common.c:1994 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "正在轉換 %s 檔案 %s 至 Unix 格式的 %s 檔案 %s...\n" @@ -599,91 +600,91 @@ msgstr "正在轉換 %s 檔案 %s 至 Unix 格式的 %s 檔案 %s...\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:2002 +#: common.c:2001 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "正在轉換 %s 檔案 %s 至 %s Unix 格式...\n" -#: common.c:2006 +#: common.c:2005 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "正在轉換 %s 檔案 %s 至 Mac 格式的 %s 檔案 %s...\n" -#: common.c:2008 +#: common.c:2007 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "正在轉換 %s 檔案 %s 至 %s Mac 格式...\n" -#: common.c:2011 +#: common.c:2010 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "正在轉換 %s 檔案 %s 至 DOS 格式的 %s 檔案 %s...\n" -#: common.c:2013 +#: common.c:2012 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "正在轉換 %s 檔案 %s 至 %s DOS 格式...\n" -#: common.c:2020 +#: common.c:2019 #, c-format msgid "problems converting file %s to file %s\n" msgstr "轉換檔案 %s 到 %s 錯誤\n" -#: common.c:2022 +#: common.c:2021 #, c-format msgid "problems converting file %s\n" msgstr "轉換檔案 %s 錯誤\n" -#: common.c:2157 common.c:2207 +#: common.c:2184 common.c:2241 #, c-format msgid "can not read from input file %s:" msgstr "無法讀取 %s 輸入檔：" -#: common.c:2363 +#: common.c:2401 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "傳入 -i 或 --info 選項的 '%c' 旗標錯誤\n" -#: common.c:2499 common.c:2542 +#: common.c:2537 common.c:2580 #, c-format msgid "active code page: %d\n" msgstr "作用中編碼頁：%d\n" -#: common.c:2554 +#: common.c:2592 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "指定的轉換模式 %s 不合法\n" -#: common.c:2562 common.c:2592 +#: common.c:2600 common.c:2630 #, c-format msgid "option '%s' requires an argument\n" msgstr "選項 '%s' 需要一個參數\n" -#: common.c:2584 +#: common.c:2622 #, c-format msgid "invalid %s display encoding specified\n" msgstr "指定了無效的 %s 顯示編碼方式\n" -#: common.c:2604 common.c:2618 common.c:2630 +#: common.c:2642 common.c:2656 common.c:2668 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "新檔模式中未指明檔案 %s 的目的位置\n" -#: common.c:2713 +#: common.c:2751 #, c-format msgid "can not read from input file: %s\n" msgstr "無法讀取下述輸入檔案：%s\n" -#: common.c:2723 common.c:2735 +#: common.c:2761 common.c:2773 #, c-format msgid "can not write to output file: %s\n" msgstr "無法寫入輸出檔：%s\n" -#: common.c:2810 +#: common.c:2848 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "錯誤：代理 (surrogate) 配對無效。缺少低代理。\n" -#: common.c:2826 +#: common.c:2864 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "錯誤：代理 (surrogate) 配對無效。缺少高代理。\n" diff --git a/dos2unix/unix2dos.c b/dos2unix/unix2dos.c index 45f3f86..1ab9d3b 100644 --- a/dos2unix/unix2dos.c +++ b/dos2unix/unix2dos.c @@ -8,7 +8,7 @@ * See also https://www.freebsd.org/copyright/freebsd-license.html * -------- * - * Copyright (C) 2009-2023 Erwin Waterlander + * Copyright (C) 2009-2024 Erwin Waterlander * Copyright (C) 1994-1995 Benjamin Lin. * All rights reserved. * @@ -69,7 +69,7 @@ void PrintLicense(void) D2U_ANSI_FPRINTF(stdout,_("\ Copyright (C) 2009-%d Erwin Waterlander\n\ Copyright (C) 1994-1995 Benjamin Lin\n\ -All rights reserved.\n\n"),2023); +All rights reserved.\n\n"),2024); PrintBSDLicense(); } diff --git a/dos2unix/version.mk b/dos2unix/version.mk index 9761784..35ea879 100644 --- a/dos2unix/version.mk +++ b/dos2unix/version.mk @@ -1,4 +1,4 @@ -DOS2UNIX_VERSION = 7.5.1 -DOS2UNIX_VERSION_SHORT = 751 -DOS2UNIX_DATE = 2023-08-29 +DOS2UNIX_VERSION = 7.5.2 +DOS2UNIX_VERSION_SHORT = 752 +DOS2UNIX_DATE = 2024-01-22 DOS2UNIX_AUTHOR = 'Erwin Waterlander' diff --git a/highlight-wrapper/highlight b/highlight-wrapper/highlight index 2310c35..472b0cf 160000 --- a/highlight-wrapper/highlight +++ b/highlight-wrapper/highlight @@ -1 +1 @@ -Subproject commit 2310c35b3aa3d691d7c73636e895bb1133831e2d +Subproject commit 472b0cf064fb756ba10976a0fb7564b08e7b20ba diff --git a/highlight-wrapper/highlight-wrapper.xcodeproj/xcshareddata/xcschemes/highlight-wrapper.xcscheme b/highlight-wrapper/highlight-wrapper.xcodeproj/xcshareddata/xcschemes/highlight-wrapper.xcscheme index 5b1cda7..bce84be 100644 --- a/highlight-wrapper/highlight-wrapper.xcodeproj/xcshareddata/xcschemes/highlight-wrapper.xcscheme +++ b/highlight-wrapper/highlight-wrapper.xcodeproj/xcshareddata/xcschemes/highlight-wrapper.xcscheme @@ -1,6 +1,6 @@