Changeset 381311b in git


Ignore:
Timestamp:
05/03/15 00:52:04 (5 years ago)
Author:
Olly Betts <olly@…>
Branches:
line_contents, master, stereo, travis-osx
Children:
9435c45
Parents:
40b02e8
Message:

lib/survex.pot,src/img_hosted.c: Include the filename when we run
out of memory while reading a file with img, which avoids the %.0s
hack and is more helpful for users.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r40b02e8 r381311b  
     1Thu Mar 05 00:51:17 GMT 2015  Olly Betts <olly@survex.com>
     2
     3        * lib/survex.pot,src/img_hosted.c: Include the filename when we run
     4          out of memory while reading a file with img, which avoids the %.0s
     5          hack and is more helpful for users.
     6
    17Wed Mar 04 12:30:39 GMT 2015  Olly Betts <olly@survex.com>
    28
  • lib/survex.pot

    r40b02e8 r381311b  
    2020#, c-format
    2121msgid "Out of memory (couldn’t find %lu bytes)."
     22msgstr ""
     23
     24#. TRANSLATORS: %s will be replaced by the filename that we were trying
     25#. to read when we ran out of memory.
     26#: ../src/img_hosted.c:34
     27#: n:38
     28#, c-format
     29msgid "Out of memory trying to read file “%s”"
    2230msgstr ""
    2331
     
    368376#, c-format
    369377msgid "Invalid units “%s” for quantity"
    370 msgstr ""
    371 
    372 #. TRANSLATORS: nasty hack - this message is for the .3d img code, and all
    373 #. errors there take a filename parameter - we don’t really want it here,
    374 #. so lose it with "%.0s" (which should display 0 characters from the
    375 #. filename) FIXME: sort out this
    376 #: ../src/img_hosted.c:35
    377 #: n:38
    378 msgid "Out of memory %.0s"
    379378msgstr ""
    380379
  • src/img_hosted.c

    r40b02e8 r381311b  
    11/* img_hosted.c
    22 * Build img for use in Survex code
    3  * Copyright (C) 1997,1999,2000,2001,2011,2013,2014 Olly Betts
     3 * Copyright (C) 1997,1999,2000,2001,2011,2013,2014,2015 Olly Betts
    44 *
    55 * This program is free software; you can redistribute it and/or modify
     
    2929    /* IMG_NONE */         0,
    3030    /* IMG_FILENOTFOUND */ /*Couldn’t open file “%s”*/24,
    31     /* TRANSLATORS: nasty hack - this message is for the .3d img code, and all
    32      * errors there take a filename parameter - we don’t really want it here,
    33      * so lose it with "%.0s" (which should display 0 characters from the
    34      * filename) FIXME: sort out this */
    35     /* IMG_OUTOFMEMORY */  /*Out of memory %.0s*/38,
     31    /* TRANSLATORS: %s will be replaced by the filename that we were trying
     32     * to read when we ran out of memory.
     33     */
     34    /* IMG_OUTOFMEMORY */  /*Out of memory trying to read file “%s”*/38,
    3635    /* IMG_DIRECTORY */    /*Filename “%s” refers to directory*/44,
    3736    /* IMG_CANTOPENOUT */  /*Failed to open output file “%s”*/47,
Note: See TracChangeset for help on using the changeset viewer.