diff --git a/.gitattributes b/.gitattributes index ef66593dd9..af901b7b6e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,9 @@ src/testdir/test42.in diff -# ignore vim.pot creation date when diffing +# vim.pot may change just by incrementing a patch number +# so ignore the following differences: +# - POT-Creation Date +# - comments in version.c for line numbers: # set this up using: -# git config diff.ignore_pot_date.textconv 'grep -v "^.POT-Creation-Date:.*"' +# git config diff.ignore_pot_date.textconv 'grep -Ev "^.(POT-Creation-Date:|.*version\.c).*"' src/po/vim.pot diff=ignore_pot_date diff --git a/src/po/vim.pot b/src/po/vim.pot index f64ae7dfdf..11c4dbd485 100644 --- a/src/po/vim.pot +++ b/src/po/vim.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-07-16 20:35+0200\n" +"POT-Creation-Date: 2025-07-17 20:16+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4257,327 +4257,327 @@ msgstr "" msgid "%s (%s, compiled %s)" msgstr "" -#: ../version.c:4048 +#: ../version.c:4050 msgid "" "\n" "MS-Windows ARM64 GUI/console version" msgstr "" -#: ../version.c:4050 +#: ../version.c:4052 msgid "" "\n" "MS-Windows 64-bit GUI/console version" msgstr "" -#: ../version.c:4053 +#: ../version.c:4055 msgid "" "\n" "MS-Windows 32-bit GUI/console version" msgstr "" -#: ../version.c:4058 +#: ../version.c:4060 msgid "" "\n" "MS-Windows ARM64 GUI version" msgstr "" -#: ../version.c:4060 +#: ../version.c:4062 msgid "" "\n" "MS-Windows 64-bit GUI version" msgstr "" -#: ../version.c:4063 +#: ../version.c:4065 msgid "" "\n" "MS-Windows 32-bit GUI version" msgstr "" -#: ../version.c:4067 +#: ../version.c:4069 msgid " with OLE support" msgstr "" -#: ../version.c:4072 -msgid "" -"\n" -"MS-Windows ARM64 console version" -msgstr "" - #: ../version.c:4074 msgid "" "\n" +"MS-Windows ARM64 console version" +msgstr "" + +#: ../version.c:4076 +msgid "" +"\n" "MS-Windows 64-bit console version" msgstr "" -#: ../version.c:4077 +#: ../version.c:4079 msgid "" "\n" "MS-Windows 32-bit console version" msgstr "" -#: ../version.c:4083 +#: ../version.c:4085 msgid "" "\n" "macOS version" msgstr "" -#: ../version.c:4085 +#: ../version.c:4087 msgid "" "\n" "macOS version w/o darwin feat." msgstr "" -#: ../version.c:4095 +#: ../version.c:4097 msgid "" "\n" "OpenVMS version" msgstr "" -#: ../version.c:4110 +#: ../version.c:4112 msgid "" "\n" "Included patches: " msgstr "" -#: ../version.c:4135 +#: ../version.c:4137 msgid "" "\n" "Extra patches: " msgstr "" -#: ../version.c:4147 ../version.c:4458 +#: ../version.c:4149 ../version.c:4460 msgid "Modified by " msgstr "" -#: ../version.c:4154 +#: ../version.c:4156 msgid "" "\n" "Compiled " msgstr "" -#: ../version.c:4157 +#: ../version.c:4159 msgid "by " msgstr "" -#: ../version.c:4169 -msgid "" -"\n" -"Huge version " -msgstr "" - #: ../version.c:4171 msgid "" "\n" -"Normal version " +"Huge version " msgstr "" #: ../version.c:4173 msgid "" "\n" +"Normal version " +msgstr "" + +#: ../version.c:4175 +msgid "" +"\n" "Tiny version " msgstr "" -#: ../version.c:4176 +#: ../version.c:4178 msgid "without GUI." msgstr "" -#: ../version.c:4179 +#: ../version.c:4181 msgid "with GTK3 GUI." msgstr "" -#: ../version.c:4181 +#: ../version.c:4183 msgid "with GTK2-GNOME GUI." msgstr "" -#: ../version.c:4183 +#: ../version.c:4185 msgid "with GTK2 GUI." msgstr "" -#: ../version.c:4186 +#: ../version.c:4188 msgid "with X11-Motif GUI." msgstr "" -#: ../version.c:4188 +#: ../version.c:4190 msgid "with Haiku GUI." msgstr "" -#: ../version.c:4190 +#: ../version.c:4192 msgid "with Photon GUI." msgstr "" -#: ../version.c:4192 +#: ../version.c:4194 msgid "with GUI." msgstr "" -#: ../version.c:4194 +#: ../version.c:4196 msgid " Features included (+) or not (-):\n" msgstr "" -#: ../version.c:4201 +#: ../version.c:4203 msgid " system vimrc file: \"" msgstr "" -#: ../version.c:4206 +#: ../version.c:4208 msgid " user vimrc file: \"" msgstr "" -#: ../version.c:4211 +#: ../version.c:4213 msgid " 2nd user vimrc file: \"" msgstr "" -#: ../version.c:4216 ../version.c:4223 ../version.c:4227 +#: ../version.c:4218 ../version.c:4225 ../version.c:4229 msgid " 3rd user vimrc file: \"" msgstr "" -#: ../version.c:4219 +#: ../version.c:4221 msgid " 4th user vimrc file: \"" msgstr "" -#: ../version.c:4232 +#: ../version.c:4234 msgid " user exrc file: \"" msgstr "" -#: ../version.c:4237 +#: ../version.c:4239 msgid " 2nd user exrc file: \"" msgstr "" -#: ../version.c:4243 +#: ../version.c:4245 msgid " system gvimrc file: \"" msgstr "" -#: ../version.c:4247 +#: ../version.c:4249 msgid " user gvimrc file: \"" msgstr "" -#: ../version.c:4251 +#: ../version.c:4253 msgid "2nd user gvimrc file: \"" msgstr "" -#: ../version.c:4256 +#: ../version.c:4258 msgid "3rd user gvimrc file: \"" msgstr "" -#: ../version.c:4261 +#: ../version.c:4263 msgid " defaults file: \"" msgstr "" -#: ../version.c:4266 +#: ../version.c:4268 msgid " system menu file: \"" msgstr "" -#: ../version.c:4274 +#: ../version.c:4276 msgid " fall-back for $VIM: \"" msgstr "" -#: ../version.c:4280 +#: ../version.c:4282 msgid " f-b for $VIMRUNTIME: \"" msgstr "" -#: ../version.c:4284 +#: ../version.c:4286 msgid "Compilation: " msgstr "" -#: ../version.c:4290 +#: ../version.c:4292 msgid "Compiler: " msgstr "" -#: ../version.c:4295 +#: ../version.c:4297 msgid "Linking: " msgstr "" -#: ../version.c:4300 +#: ../version.c:4302 msgid " DEBUG BUILD" msgstr "" -#: ../version.c:4336 +#: ../version.c:4338 msgid "VIM - Vi IMproved" msgstr "" -#: ../version.c:4338 +#: ../version.c:4340 msgid "version " msgstr "" -#: ../version.c:4339 +#: ../version.c:4341 msgid "by Bram Moolenaar et al." msgstr "" -#: ../version.c:4343 +#: ../version.c:4345 msgid "Vim is open source and freely distributable" msgstr "" -#: ../version.c:4345 +#: ../version.c:4347 msgid "Help poor children in Uganda!" msgstr "" -#: ../version.c:4346 +#: ../version.c:4348 msgid "type :help iccf for information " msgstr "" -#: ../version.c:4348 +#: ../version.c:4350 msgid "type :q to exit " msgstr "" -#: ../version.c:4349 +#: ../version.c:4351 msgid "type :help or for on-line help" msgstr "" -#: ../version.c:4350 +#: ../version.c:4352 msgid "type :help version9 for version info" msgstr "" -#: ../version.c:4353 +#: ../version.c:4355 msgid "Running in Vi compatible mode" msgstr "" -#: ../version.c:4354 +#: ../version.c:4356 msgid "type :set nocp for Vim defaults" msgstr "" -#: ../version.c:4355 +#: ../version.c:4357 msgid "type :help cp-default for info on this" msgstr "" -#: ../version.c:4370 +#: ../version.c:4372 msgid "menu Help->Orphans for information " msgstr "" -#: ../version.c:4372 +#: ../version.c:4374 msgid "Running modeless, typed text is inserted" msgstr "" -#: ../version.c:4373 +#: ../version.c:4375 msgid "menu Edit->Global Settings->Toggle Insert Mode " msgstr "" -#: ../version.c:4374 +#: ../version.c:4376 msgid " for two modes " msgstr "" -#: ../version.c:4378 +#: ../version.c:4380 msgid "menu Edit->Global Settings->Toggle Vi Compatible" msgstr "" -#: ../version.c:4379 +#: ../version.c:4381 msgid " for Vim defaults " msgstr "" -#: ../version.c:4420 +#: ../version.c:4422 msgid "Sponsor Vim development!" msgstr "" -#: ../version.c:4421 +#: ../version.c:4423 msgid "Become a registered Vim user!" msgstr "" -#: ../version.c:4424 +#: ../version.c:4426 msgid "type :help sponsor for information " msgstr "" -#: ../version.c:4425 +#: ../version.c:4427 msgid "type :help register for information " msgstr "" -#: ../version.c:4427 +#: ../version.c:4429 msgid "menu Help->Sponsor/Register for information " msgstr "" @@ -12940,7 +12940,7 @@ msgid "expression used to obtain a diff file" msgstr "" #: ../../runtime/optwin.vim:1059 -msgid "list of addresses for syncing of a diff" +msgid "list of addresses for anchoring a diff" msgstr "" #: ../../runtime/optwin.vim:1062