From 738715858a0ca28ce4a85e0b556e09368e96cdf0 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Sat, 10 Nov 2018 21:46:24 +0100 Subject: Mark debugging messages as non-translatable --- po/POTFILES | 1 - po/colloquium.pot | 730 ++++++++++++------------------------------------ po/de.po | 733 +++++++++++++------------------------------------ src/colloquium.c | 7 +- src/debugger.c | 10 +- src/frame.c | 105 +++---- src/imagestore.c | 7 +- src/narrative_window.c | 10 +- src/pr_clock.c | 2 +- src/presentation.c | 8 +- src/render.c | 2 +- src/sc_editor.c | 26 +- src/sc_interp.c | 14 +- src/sc_parse.c | 28 +- src/stylesheet.c | 9 +- 15 files changed, 483 insertions(+), 1209 deletions(-) diff --git a/po/POTFILES b/po/POTFILES index e87a966..0f7b398 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -18,4 +18,3 @@ src/testcard.c src/utils.c data/menus.ui data/stylesheeteditor.ui -data/savepresentation.ui diff --git a/po/colloquium.pot b/po/colloquium.pot index e10ebb1..6ca22cb 100644 --- a/po/colloquium.pot +++ b/po/colloquium.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: colloquium\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-29 17:31+0100\n" +"POT-Creation-Date: 2018-11-10 21:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,25 +26,16 @@ msgstr "" msgid "translator-credits" msgstr "" -#: src/colloquium.c:148 -#, c-format -msgid "WTF? Too many files\n" -msgstr "" - -#: src/colloquium.c:172 -#, c-format -msgid "Failed to convert file list\n" -msgstr "" - #: src/colloquium.c:195 msgid "Open Presentation" msgstr "" -#: src/colloquium.c:198 src/narrative_window.c:268 src/narrative_window.c:434 +#: src/colloquium.c:198 src/narrative_window.c:179 src/narrative_window.c:322 +#: src/narrative_window.c:488 msgid "_Cancel" msgstr "" -#: src/colloquium.c:199 src/narrative_window.c:269 +#: src/colloquium.c:199 src/narrative_window.c:323 msgid "_Open" msgstr "" @@ -58,38 +49,24 @@ msgstr "" msgid "Failed to create config\n" msgstr "" -#: src/colloquium.c:277 -#, c-format -msgid "Don't understand '%s', assuming false\n" -msgstr "" - #: src/colloquium.c:289 #, c-format msgid "Failed to open config %s\n" msgstr "" -#. Set the application menu only if it will be shown by the -#. * desktop environment. All the entries are already in the -#. * normal menus, so don't let GTK create a fallback menu in the -#. * menu bar. -#: src/colloquium.c:344 -#, c-format -msgid "Using app menu\n" -msgstr "" - -#: src/colloquium.c:361 +#: src/colloquium.c:360 #, c-format msgid "Failed to create config folder\n" msgstr "" -#: src/colloquium.c:430 +#: src/colloquium.c:429 #, c-format msgid "" "Syntax: %s [options] []\n" "\n" msgstr "" -#: src/colloquium.c:431 +#: src/colloquium.c:430 #, c-format msgid "" "Narrative-based presentation system.\n" @@ -97,331 +74,77 @@ msgid "" " -h, --help Display this help message.\n" msgstr "" -#. Text paragraph -#: src/debugger.c:89 -msgid "text" -msgstr "" - -#. Callback paragraph -#: src/debugger.c:92 -msgid "callback" -msgstr "" - -#. Unknown paragraph type -#: src/debugger.c:95 -msgid "unknown" -msgstr "" - -#. How many text runs -#: src/debugger.c:107 -#, c-format -msgid " %i runs" -msgstr "" - -#. Failed to get debug info for paragraph -#: src/debugger.c:114 -msgid "Error" -msgstr "" - -#: src/frame.c:118 -#, c-format -msgid "Couldn't allocate children\n" -msgstr "" - -#: src/frame.c:195 -#, c-format -msgid "%s%p (%.2f x %.2f)\n" -msgstr "" - -#: src/frame.c:223 -#, c-format -msgid "NULL run passed to run_text_len\n" -msgstr "" - -#: src/frame.c:228 -#, c-format -msgid "NULL scblock in run_text_len\n" -msgstr "" - -#: src/frame.c:233 -#, c-format -msgid "NULL scblock contents in run_text_len\n" -msgstr "" - -#: src/frame.c:271 -#, c-format -msgid "Couldn't allocate combined text (%lli)\n" -msgstr "" - -#: src/frame.c:358 -#, c-format -msgid "Failed to add run.\n" -msgstr "" - -#: src/frame.c:411 -#, c-format -msgid "insert_paragraph(): pos too high!\n" -msgstr "" - -#: src/frame.c:445 -#, c-format -msgid "Failed to add callback paragraph\n" -msgstr "" - -#: src/frame.c:473 -#, c-format -msgid "Adding image without ImageStore!\n" -msgstr "" - -#: src/frame.c:482 -#, c-format -msgid "Failed to add image paragraph\n" -msgstr "" - -#: src/frame.c:488 -#, c-format -msgid "Couldn't get size for %s\n" -msgstr "" - -#: src/frame.c:590 -#, c-format -msgid "surf = NULL!\n" -msgstr "" - -#: src/frame.c:634 -#, c-format -msgid "para %i, pos %li, trail %i\n" -msgstr "" - -#: src/frame.c:679 -#, c-format -msgid "Couldn't prepend block\n" -msgstr "" - -#: src/frame.c:705 src/frame.c:748 src/frame.c:779 -#, c-format -msgid "Cursor frame is NULL.\n" -msgstr "" - -#: src/frame.c:727 -#, c-format -msgid "No paragraphs in frame.\n" -msgstr "" - -#: src/frame.c:753 -#, c-format -msgid "Highlight paragraph number is too high!\n" -msgstr "" - -#: src/frame.c:784 +#: src/frame.c:513 #, c-format -msgid "Cursor paragraph number is too high!\n" +msgid "Couldn't determine size of image '%s'\n" msgstr "" -#: src/frame.c:903 -#, c-format -msgid "pos_trail_to_offset: Offset too high\n" -msgstr "" - -#: src/frame.c:916 -#, c-format -msgid "pos_trail_to_offset: No run\n" -msgstr "" - -#: src/frame.c:921 -#, c-format -msgid "pos_trail_to_offset: SCBlock = NULL?\n" -msgstr "" - -#: src/frame.c:926 -#, c-format -msgid "pos_trail_to_offset: No contents (%p name=%s, options=%s)\n" -msgstr "" - -#: src/frame.c:944 -#, c-format -msgid "" -"Offset outside string! '%s'\n" -"char_offs %li offs %li len %li\n" -msgstr "" - -#: src/frame.c:962 -#, c-format -msgid "Frame is NULL.\n" -msgstr "" - -#: src/frame.c:967 -#, c-format -msgid "Paragraph number is too high!\n" -msgstr "" - -#: src/frame.c:974 -#, c-format -msgid "Paragraph is not text.\n" -msgstr "" - -#: src/frame.c:981 -#, c-format -msgid "Couldn't find run!\n" -msgstr "" - -#: src/frame.c:996 src/frame.c:1696 -#, c-format -msgid "Couldn't find run to insert into.\n" -msgstr "" - -#: src/frame.c:1001 -#, c-format -msgid "No runs in paragraph?\n" -msgstr "" - -#: src/frame.c:1082 -#, c-format -msgid "deleting run %i of %i from para %p\n" -msgstr "" - -#: src/frame.c:1168 -#, c-format -msgid "Couldn't find paragraph %p\n" -msgstr "" - -#: src/frame.c:1190 -#, c-format -msgid "Couldn't find paragraph to delete (%p)\n" -msgstr "" - -#: src/frame.c:1194 -#, c-format -msgid "deleting paragraph %i (%p)\n" -msgstr "" - -#: src/frame.c:1221 -#, c-format -msgid "Couldn't find block %p between paragraphs %p and %p\n" -msgstr "" - -#: src/frame.c:1243 -#, c-format -msgid "Failed to allocate merged runs.\n" -msgstr "" - -#: src/frame.c:1286 -#, c-format -msgid "Failed to merge paragraphs\n" -msgstr "" - -#: src/frame.c:1302 -#, c-format -msgid "Couldn't find paragraphs to merge by newpara\n" -msgstr "" - -#: src/frame.c:1362 -#, c-format -msgid "Delete outside editable region\n" -msgstr "" - -#: src/frame.c:1504 -#, c-format -msgid "Paragraph %p\n" -msgstr "" - -#: src/frame.c:1508 -#, c-format -msgid "%i runs:\n" -msgstr "" - -#: src/frame.c:1510 -#, c-format -msgid " Run %2i: SCBlock %p %s '%s'\n" -msgstr "" - -#: src/frame.c:1517 -#, c-format -msgid " Image: %s\n" -msgstr "" - -#: src/frame.c:1519 -#, c-format -msgid " Other paragraph type\n" -msgstr "" - -#: src/frame.c:1537 src/sc_editor.c:999 -#, c-format -msgid "Failed to insert paragraph\n" +#: src/narrative_window.c:148 +msgid "Failed to save presentation" msgstr "" -#: src/imagestore.c:216 -#, c-format -msgid "Couldn't allocate memory.\n" +#: src/narrative_window.c:176 +msgid "Save presentation" msgstr "" -#: src/imagestore.c:330 -#, c-format -msgid "Store %p contains %i records.\n" +#: src/narrative_window.c:180 data/menus.ui:24 +msgid "_Save" msgstr "" -#: src/imagestore.c:334 -#, c-format -msgid "%s :\n" +#: src/narrative_window.c:188 +msgid "Create/update private stylesheet for this presentation" msgstr "" -#: src/narrative_window.c:117 -msgid "Failed to save presentation" +#: src/narrative_window.c:191 +msgid "Create/update default stylesheet for presentations in folder" msgstr "" -#: src/narrative_window.c:186 -#, c-format -msgid "Not a slide!\n" +#: src/narrative_window.c:194 +msgid "Don't save stylesheet at all" msgstr "" -#: src/narrative_window.c:220 +#: src/narrative_window.c:267 #, c-format -msgid "Failed to load\n" +msgid "Failed to load stylesheet\n" msgstr "" -#: src/narrative_window.c:265 +#: src/narrative_window.c:319 msgid "Load stylesheet" msgstr "" -#: src/narrative_window.c:298 -#, c-format -msgid "Failed to split paragraph\n" -msgstr "" - -#: src/narrative_window.c:431 +#: src/narrative_window.c:485 msgid "Export PDF" msgstr "" -#: src/narrative_window.c:435 +#: src/narrative_window.c:489 msgid "_Export" msgstr "" -#: src/narrative_window.c:730 -#, c-format -msgid "Narrative window is already open!\n" +#: src/narrative_window.c:709 +msgid "Too many open slide windows" msgstr "" -#: src/narrative_window.c:777 data/menus.ui:135 +#: src/narrative_window.c:850 data/menus.ui:135 msgid "Start slideshow" msgstr "" -#: src/narrative_window.c:788 +#: src/narrative_window.c:861 msgid "Add slide" msgstr "" -#: src/narrative_window.c:798 +#: src/narrative_window.c:871 msgid "First slide" msgstr "" -#: src/narrative_window.c:805 +#: src/narrative_window.c:878 msgid "Previous slide" msgstr "" -#: src/narrative_window.c:812 +#: src/narrative_window.c:885 msgid "Next slide" msgstr "" -#: src/narrative_window.c:819 +#: src/narrative_window.c:892 msgid "Last slide" msgstr "" @@ -429,11 +152,6 @@ msgstr "" msgid "Timer is NOT running!" msgstr "" -#: src/pr_clock.c:285 -#, c-format -msgid "Invalid time '%s'\n" -msgstr "" - #: src/pr_clock.c:329 src/pr_clock.c:380 msgid "Start" msgstr "" @@ -478,41 +196,41 @@ msgstr "" msgid "Presentation clock" msgstr "" -#: src/presentation.c:60 +#: src/presentation.c:55 msgid "(untitled)" msgstr "" -#: src/presentation.c:159 +#: src/presentation.c:155 src/stylesheet.c:253 src/stylesheet.c:263 #, c-format msgid "Open failed: %s\n" msgstr "" -#: src/presentation.c:219 +#: src/presentation.c:160 #, c-format -msgid "Couldn't find first slide!\n" +msgid "Couldn't save presentation\n" msgstr "" -#: src/presentation.c:237 +#: src/presentation.c:166 #, c-format -msgid "Couldn't find last slide!\n" +msgid "Saving stylesheet to %s\n" msgstr "" -#: src/presentation.c:258 +#: src/presentation.c:170 #, c-format -msgid "Couldn't find next slide!\n" +msgid "Couldn't save stylesheet\n" msgstr "" -#: src/presentation.c:279 +#: src/presentation.c:180 #, c-format -msgid "Couldn't find prev slide!\n" +msgid "Not saving the stylesheet\n" msgstr "" -#: src/presentation.c:307 +#: src/presentation.c:331 #, c-format msgid "Failed to load '%s'\n" msgstr "" -#: src/presentation.c:320 +#: src/presentation.c:344 #, c-format msgid "Parse error.\n" msgstr "" @@ -525,222 +243,61 @@ msgstr "" msgid "Print the narrative" msgstr "" -#: src/render.c:194 -#, c-format -msgid "Failed to set up interpreter.\n" -msgstr "" - -#: src/render.c:290 +#: src/render.c:289 #, c-format msgid "Couldn't create Cairo surface\n" msgstr "" -#: src/sc_editor.c:73 -#, c-format -msgid "Paragraphs in current frame:\n" -msgstr "" - #: src/sc_editor.c:479 #, c-format msgid "No frame selected for paste\n" msgstr "" -#. FIXME: Implement this -#: src/sc_editor.c:924 -#, c-format -msgid "Deleting non-text paragraph\n" -msgstr "" - -#: src/sc_editor.c:965 -#, c-format -msgid "Position not editable\n" -msgstr "" - -#: src/sc_editor.c:986 -#, c-format -msgid "No SCBlock for para\n" -msgstr "" - -#: src/sc_editor.c:993 -#, c-format -msgid "Failed to add SCBlock\n" -msgstr "" - -#: src/sc_editor.c:1579 -#, c-format -msgid "Release on pointless drag.\n" -msgstr "" - #: src/sc_editor.c:1594 #, c-format msgid "Failed to create frame!\n" msgstr "" -#: src/sc_editor.c:1703 -#, c-format -msgid "Cursor frame block = %p\n" -msgstr "" - -#: src/sc_editor.c:1704 src/sc_editor.c:1712 -#, c-format -msgid "Editor top block = %p\n" -msgstr "" - -#: src/sc_editor.c:1711 -#, c-format -msgid "Debugging the top frame:\n" -msgstr "" - -#: src/sc_editor.c:1916 -#, c-format -msgid "Failed to allocate SC\n" -msgstr "" - -#: src/sc_editor.c:2104 -#, c-format -msgid "WARNING: Changing imagestore\n" -msgstr "" - -#: src/sc_editor.c:2148 +#: src/sc_editor.c:2146 #, c-format msgid "Failed to load background: %s\n" msgstr "" -#: src/sc_interp.c:175 -#, c-format -msgid "Failed to grow callback list\n" -msgstr "" - -#: src/sc_interp.c:200 -#, c-format -msgid "WARNING: Interpreter already has a callback list.\n" -msgstr "" - -#: src/sc_interp.c:295 -#, c-format -msgid "Couldn't load font '%s' (font map %p, pc %p)\n" -msgstr "" - -#: src/sc_interp.c:316 -#, c-format -msgid "Couldn't describe font.\n" -msgstr "" - -#: src/sc_interp.c:350 +#: src/sc_interp.c:362 #, c-format msgid "Invalid font size '%s'\n" msgstr "" -#: src/sc_interp.c:401 src/sc_interp.c:444 +#: src/sc_interp.c:413 src/sc_interp.c:439 src/sc_interp.c:462 #, c-format msgid "Invalid colour\n" msgstr "" -#: src/sc_interp.c:495 -#, c-format -msgid "Failed to add to stack.\n" -msgstr "" - -#: src/sc_interp.c:667 -#, c-format -msgid "Invalid units in '%s'\n" -msgstr "" - -#: src/sc_interp.c:732 -#, c-format -msgid "Invalid dimensions '%s'\n" -msgstr "" - -#: src/sc_interp.c:745 +#: src/sc_interp.c:722 #, c-format msgid "Unrecognised frame option '%s'\n" msgstr "" -#: src/sc_interp.c:802 -#, c-format -msgid "Unterminated filename?\n" -msgstr "" - -#: src/sc_interp.c:811 +#: src/sc_interp.c:788 #, c-format msgid "Unrecognised image option '%s'\n" msgstr "" -#: src/sc_interp.c:984 +#: src/sc_interp.c:958 #, c-format msgid "Failed to add frame.\n" msgstr "" -#: src/sc_interp.c:1026 +#: src/sc_interp.c:1003 #, c-format msgid "Invalid image options '%s'\n" msgstr "" -#: src/sc_parse.c:116 -#, c-format -msgid "Couldn't find previous\n" -msgstr "" - -#: src/sc_parse.c:274 -#, c-format -msgid "Unlinking at top\n" -msgstr "" - -#: src/sc_parse.c:278 -#, c-format -msgid "Couldn't find block parent!\n" -msgstr "" - -#: src/sc_parse.c:405 -#, c-format -msgid "Failed to serialise block\n" -msgstr "" - -#: src/sc_parse.c:410 -#, c-format -msgid "Write failed: %s\n" -msgstr "" - -#: src/sc_parse.c:533 -#, c-format -msgid "Couldn't find end of options '%s'\n" -msgstr "" - -#: src/sc_parse.c:545 -#, c-format -msgid "Couldn't find end of content '%s'\n" -msgstr "" - -#: src/sc_parse.c:643 src/sc_parse.c:661 src/sc_parse.c:686 -#, c-format -msgid "Block add failed.\n" -msgstr "" - -#: src/sc_parse.c:653 +#: src/sc_parse.c:661 #, c-format msgid "Parse error\n" msgstr "" -#: src/sc_parse.c:703 -#, c-format -msgid "sc_block_set_name: NULL block\n" -msgstr "" - -#: src/sc_parse.c:771 -#, c-format -msgid "Deleting text from block \\%s\n" -msgstr "" - -#: src/sc_parse.c:784 -#, c-format -msgid "Invalid delete: %i %i %i\n" -msgstr "" - -#: src/sc_parse.c:806 -#, c-format -msgid "Splitting a block with a child!\n" -msgstr "" - #: src/slideshow.c:216 src/testcard.c:273 #, c-format msgid "Single monitor mode\n" @@ -757,10 +314,10 @@ msgstr "" #: src/stylesheet.c:70 #, c-format -msgid "Invalid bg gradient spec '%s'\n" +msgid "Invalid background gradient '%s'\n" msgstr "" -#: src/stylesheet.c:77 src/stylesheet.c:80 src/stylesheet_editor.c:125 +#: src/stylesheet.c:77 src/stylesheet.c:80 src/stylesheet_editor.c:184 #, c-format msgid "Failed to parse colour: %s\n" msgstr "" @@ -770,27 +327,27 @@ msgstr "" msgid "Failed to load stylesheet '%s'\n" msgstr "" -#: src/stylesheet.c:159 src/stylesheet.c:190 src/stylesheet.c:213 +#: src/stylesheet.c:113 #, c-format -msgid "No stylesheet!\n" +msgid "Failed to load stylesheet: %s\n" msgstr "" -#: src/stylesheet_editor.c:84 +#: src/stylesheet_editor.c:88 #, c-format msgid "Failed to parse quad: %s\n" msgstr "" -#: src/stylesheet_editor.c:102 +#: src/stylesheet_editor.c:123 #, c-format -msgid "Failed to parse double: %s\n" +msgid "Failed to parse dims: %s\n" msgstr "" -#: src/stylesheet_editor.c:288 +#: src/stylesheet_editor.c:140 #, c-format -msgid "Spacing too long\n" +msgid "Failed to parse double: %s\n" msgstr "" -#: src/stylesheet_editor.c:359 +#: src/stylesheet_editor.c:505 #, c-format msgid "Slide size too long\n" msgstr "" @@ -837,6 +394,16 @@ msgstr "" msgid "Invalid tuple '%s'\n" msgstr "" +#: src/utils.c:92 +#, c-format +msgid "Invalid units in '%s'\n" +msgstr "" + +#: src/utils.c:135 +#, c-format +msgid "Invalid dimensions '%s'\n" +msgstr "" + #: data/menus.ui:9 msgid "File" msgstr "" @@ -849,10 +416,6 @@ msgstr "" msgid "_Open..." msgstr "" -#: data/menus.ui:24 -msgid "_Save" -msgstr "" - #: data/menus.ui:29 msgid "Save As..." msgstr "" @@ -929,7 +492,7 @@ msgstr "" msgid "Slide" msgstr "" -#: data/menus.ui:125 +#: data/menus.ui:125 data/stylesheeteditor.ui:1377 msgid "Slide title" msgstr "" @@ -965,102 +528,175 @@ msgstr "" msgid "_About" msgstr "" -#: data/stylesheeteditor.ui:97 +#: data/stylesheeteditor.ui:157 msgid "Stylesheet editor" msgstr "" -#: data/stylesheeteditor.ui:167 +#: data/stylesheeteditor.ui:227 msgid "This style will be used in the narrative editor" msgstr "" -#: data/stylesheeteditor.ui:185 data/stylesheeteditor.ui:801 +#: data/stylesheeteditor.ui:245 data/stylesheeteditor.ui:905 +#: data/stylesheeteditor.ui:1579 msgid "Text:" msgstr "" -#: data/stylesheeteditor.ui:239 data/stylesheeteditor.ui:692 -#: data/stylesheeteditor.ui:855 +#: data/stylesheeteditor.ui:299 data/stylesheeteditor.ui:796 +#: data/stylesheeteditor.ui:959 data/stylesheeteditor.ui:1633 msgid "Background:" msgstr "" -#: data/stylesheeteditor.ui:252 data/stylesheeteditor.ui:705 -#: data/stylesheeteditor.ui:868 +#: data/stylesheeteditor.ui:312 data/stylesheeteditor.ui:809 +#: data/stylesheeteditor.ui:972 data/stylesheeteditor.ui:1646 msgid "Flat colour" msgstr "" -#: data/stylesheeteditor.ui:253 data/stylesheeteditor.ui:706 -#: data/stylesheeteditor.ui:869 +#: data/stylesheeteditor.ui:313 data/stylesheeteditor.ui:810 +#: data/stylesheeteditor.ui:973 data/stylesheeteditor.ui:1647 msgid "Horizontal gradient" msgstr "" -#: data/stylesheeteditor.ui:254 data/stylesheeteditor.ui:707 -#: data/stylesheeteditor.ui:870 +#: data/stylesheeteditor.ui:314 data/stylesheeteditor.ui:811 +#: data/stylesheeteditor.ui:974 data/stylesheeteditor.ui:1648 msgid "Vertical gradient" msgstr "" -#: data/stylesheeteditor.ui:324 data/stylesheeteditor.ui:463 -#: data/stylesheeteditor.ui:940 data/stylesheeteditor.ui:1079 +#: data/stylesheeteditor.ui:369 data/stylesheeteditor.ui:1029 +#: data/stylesheeteditor.ui:1703 +msgid "Alignment:" +msgstr "" + +#: data/stylesheeteditor.ui:384 data/stylesheeteditor.ui:1044 +#: data/stylesheeteditor.ui:1718 +msgid "Left" +msgstr "" + +#: data/stylesheeteditor.ui:385 data/stylesheeteditor.ui:1045 +#: data/stylesheeteditor.ui:1719 +msgid "Center" +msgstr "" + +#: data/stylesheeteditor.ui:386 data/stylesheeteditor.ui:1046 +#: data/stylesheeteditor.ui:1720 +msgid "Right" +msgstr "" + +#: data/stylesheeteditor.ui:428 data/stylesheeteditor.ui:567 +#: data/stylesheeteditor.ui:1088 data/stylesheeteditor.ui:1227 +#: data/stylesheeteditor.ui:1762 data/stylesheeteditor.ui:1900 msgid "Left:" msgstr "" -#: data/stylesheeteditor.ui:337 data/stylesheeteditor.ui:476 -#: data/stylesheeteditor.ui:953 data/stylesheeteditor.ui:1092 +#: data/stylesheeteditor.ui:441 data/stylesheeteditor.ui:580 +#: data/stylesheeteditor.ui:1101 data/stylesheeteditor.ui:1240 +#: data/stylesheeteditor.ui:1775 data/stylesheeteditor.ui:1913 msgid "Right:" msgstr "" -#: data/stylesheeteditor.ui:350 data/stylesheeteditor.ui:489 -#: data/stylesheeteditor.ui:966 data/stylesheeteditor.ui:1105 +#: data/stylesheeteditor.ui:454 data/stylesheeteditor.ui:593 +#: data/stylesheeteditor.ui:1114 data/stylesheeteditor.ui:1253 +#: data/stylesheeteditor.ui:1788 data/stylesheeteditor.ui:1926 msgid "Top:" msgstr "" -#: data/stylesheeteditor.ui:363 data/stylesheeteditor.ui:502 -#: data/stylesheeteditor.ui:979 data/stylesheeteditor.ui:1118 +#: data/stylesheeteditor.ui:467 data/stylesheeteditor.ui:606 +#: data/stylesheeteditor.ui:1127 data/stylesheeteditor.ui:1266 +#: data/stylesheeteditor.ui:1801 data/stylesheeteditor.ui:1939 msgid "Bottom:" msgstr "" -#: data/stylesheeteditor.ui:428 data/stylesheeteditor.ui:1044 +#: data/stylesheeteditor.ui:532 data/stylesheeteditor.ui:1192 +#: data/stylesheeteditor.ui:2006 msgid "Paragraph spacing" msgstr "" -#: data/stylesheeteditor.ui:567 data/stylesheeteditor.ui:1183 +#: data/stylesheeteditor.ui:671 data/stylesheeteditor.ui:1331 +#: data/stylesheeteditor.ui:1870 msgid "Padding" msgstr "" -#: data/stylesheeteditor.ui:584 +#: data/stylesheeteditor.ui:688 msgid "Narrative" msgstr "" -#: data/stylesheeteditor.ui:611 +#: data/stylesheeteditor.ui:715 msgid "Slide width:" msgstr "" -#: data/stylesheeteditor.ui:639 +#: data/stylesheeteditor.ui:743 msgid "Slide height:" msgstr "" -#: data/stylesheeteditor.ui:667 +#: data/stylesheeteditor.ui:771 msgid "(arbitrary units)" msgstr "" -#: data/stylesheeteditor.ui:762 +#: data/stylesheeteditor.ui:866 msgid "Slides" msgstr "" -#: data/stylesheeteditor.ui:783 +#: data/stylesheeteditor.ui:887 msgid "This refers to the boxes you create within slides" msgstr "" -#: data/stylesheeteditor.ui:1203 +#: data/stylesheeteditor.ui:1351 msgid "Frames" msgstr "" -#: data/savepresentation.ui:78 -msgid "Create/update private stylesheet for this presentation" +#: data/stylesheeteditor.ui:1375 +msgid "Presentation title" msgstr "" -#: data/savepresentation.ui:93 -msgid "Create/update default stylesheet for presentations in folder" +#: data/stylesheeteditor.ui:1376 +msgid "Presentation author" msgstr "" -#: data/savepresentation.ui:109 -msgid "Don't save stylesheet at all" +#: data/stylesheeteditor.ui:1378 +msgid "Slide footer" +msgstr "" + +#: data/stylesheeteditor.ui:1379 +msgid "Slide credit" +msgstr "" + +#: data/stylesheeteditor.ui:1412 +msgid "Width:" +msgstr "" + +#: data/stylesheeteditor.ui:1425 +msgid "Height:" +msgstr "" + +#: data/stylesheeteditor.ui:1438 +msgid "Corner x:" +msgstr "" + +#: data/stylesheeteditor.ui:1451 +msgid "Corner y:" +msgstr "" + +#: data/stylesheeteditor.ui:1464 data/stylesheeteditor.ui:1477 +#: data/stylesheeteditor.ui:1490 data/stylesheeteditor.ui:1503 +#: data/stylesheeteditor.ui:1814 data/stylesheeteditor.ui:1827 +#: data/stylesheeteditor.ui:1840 data/stylesheeteditor.ui:1853 +#: data/stylesheeteditor.ui:1952 data/stylesheeteditor.ui:1965 +#: data/stylesheeteditor.ui:1978 data/stylesheeteditor.ui:1991 +msgid "0" +msgstr "" + +#: data/stylesheeteditor.ui:1519 data/stylesheeteditor.ui:1535 +#, c-format +msgid "% slide" +msgstr "" + +#: data/stylesheeteditor.ui:1520 data/stylesheeteditor.ui:1536 +msgid "units" +msgstr "" + +#: data/stylesheeteditor.ui:1559 +msgid "Geometry" +msgstr "" + +#: data/stylesheeteditor.ui:2025 +msgid "Slide furniture" msgstr "" diff --git a/po/de.po b/po/de.po index 013654c..1fd9787 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: colloquium\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-29 17:31+0100\n" +"POT-Creation-Date: 2018-11-10 21:39+0100\n" "PO-Revision-Date: 2018-04-10 23:10+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -26,25 +26,16 @@ msgstr "Erzählungsbasiertes Präsentationssystem" msgid "translator-credits" msgstr "A. N. Other" -#: src/colloquium.c:148 -#, c-format -msgid "WTF? Too many files\n" -msgstr "" - -#: src/colloquium.c:172 -#, c-format -msgid "Failed to convert file list\n" -msgstr "" - #: src/colloquium.c:195 msgid "Open Presentation" msgstr "" -#: src/colloquium.c:198 src/narrative_window.c:268 src/narrative_window.c:434 +#: src/colloquium.c:198 src/narrative_window.c:179 src/narrative_window.c:322 +#: src/narrative_window.c:488 msgid "_Cancel" msgstr "" -#: src/colloquium.c:199 src/narrative_window.c:269 +#: src/colloquium.c:199 src/narrative_window.c:323 msgid "_Open" msgstr "" @@ -58,38 +49,24 @@ msgstr "" msgid "Failed to create config\n" msgstr "" -#: src/colloquium.c:277 -#, c-format -msgid "Don't understand '%s', assuming false\n" -msgstr "" - #: src/colloquium.c:289 #, c-format msgid "Failed to open config %s\n" msgstr "" -#. Set the application menu only if it will be shown by the -#. * desktop environment. All the entries are already in the -#. * normal menus, so don't let GTK create a fallback menu in the -#. * menu bar. -#: src/colloquium.c:344 -#, c-format -msgid "Using app menu\n" -msgstr "" - -#: src/colloquium.c:361 +#: src/colloquium.c:360 #, c-format msgid "Failed to create config folder\n" msgstr "" -#: src/colloquium.c:430 +#: src/colloquium.c:429 #, c-format msgid "" "Syntax: %s [options] []\n" "\n" msgstr "" -#: src/colloquium.c:431 +#: src/colloquium.c:430 #, fuzzy, c-format msgid "" "Narrative-based presentation system.\n" @@ -97,331 +74,78 @@ msgid "" " -h, --help Display this help message.\n" msgstr "Erzählungsbasiertes Präsentationssystem" -#. Text paragraph -#: src/debugger.c:89 -msgid "text" -msgstr "" - -#. Callback paragraph -#: src/debugger.c:92 -msgid "callback" -msgstr "" - -#. Unknown paragraph type -#: src/debugger.c:95 -msgid "unknown" -msgstr "" - -#. How many text runs -#: src/debugger.c:107 -#, c-format -msgid " %i runs" -msgstr "" - -#. Failed to get debug info for paragraph -#: src/debugger.c:114 -msgid "Error" -msgstr "" - -#: src/frame.c:118 -#, c-format -msgid "Couldn't allocate children\n" -msgstr "" - -#: src/frame.c:195 -#, c-format -msgid "%s%p (%.2f x %.2f)\n" -msgstr "" - -#: src/frame.c:223 -#, c-format -msgid "NULL run passed to run_text_len\n" -msgstr "" - -#: src/frame.c:228 -#, c-format -msgid "NULL scblock in run_text_len\n" -msgstr "" - -#: src/frame.c:233 -#, c-format -msgid "NULL scblock contents in run_text_len\n" -msgstr "" - -#: src/frame.c:271 +#: src/frame.c:513 #, c-format -msgid "Couldn't allocate combined text (%lli)\n" +msgid "Couldn't determine size of image '%s'\n" msgstr "" -#: src/frame.c:358 -#, c-format -msgid "Failed to add run.\n" -msgstr "" - -#: src/frame.c:411 -#, c-format -msgid "insert_paragraph(): pos too high!\n" -msgstr "" - -#: src/frame.c:445 -#, c-format -msgid "Failed to add callback paragraph\n" -msgstr "" - -#: src/frame.c:473 -#, c-format -msgid "Adding image without ImageStore!\n" -msgstr "" - -#: src/frame.c:482 -#, c-format -msgid "Failed to add image paragraph\n" -msgstr "" - -#: src/frame.c:488 -#, c-format -msgid "Couldn't get size for %s\n" -msgstr "" - -#: src/frame.c:590 -#, c-format -msgid "surf = NULL!\n" -msgstr "" - -#: src/frame.c:634 -#, c-format -msgid "para %i, pos %li, trail %i\n" -msgstr "" - -#: src/frame.c:679 -#, c-format -msgid "Couldn't prepend block\n" -msgstr "" - -#: src/frame.c:705 src/frame.c:748 src/frame.c:779 -#, c-format -msgid "Cursor frame is NULL.\n" -msgstr "" - -#: src/frame.c:727 -#, c-format -msgid "No paragraphs in frame.\n" -msgstr "" - -#: src/frame.c:753 -#, c-format -msgid "Highlight paragraph number is too high!\n" -msgstr "" - -#: src/frame.c:784 -#, c-format -msgid "Cursor paragraph number is too high!\n" -msgstr "" - -#: src/frame.c:903 -#, c-format -msgid "pos_trail_to_offset: Offset too high\n" -msgstr "" - -#: src/frame.c:916 -#, c-format -msgid "pos_trail_to_offset: No run\n" -msgstr "" - -#: src/frame.c:921 -#, c-format -msgid "pos_trail_to_offset: SCBlock = NULL?\n" -msgstr "" - -#: src/frame.c:926 -#, c-format -msgid "pos_trail_to_offset: No contents (%p name=%s, options=%s)\n" -msgstr "" - -#: src/frame.c:944 -#, c-format -msgid "" -"Offset outside string! '%s'\n" -"char_offs %li offs %li len %li\n" -msgstr "" - -#: src/frame.c:962 -#, c-format -msgid "Frame is NULL.\n" -msgstr "" - -#: src/frame.c:967 -#, c-format -msgid "Paragraph number is too high!\n" -msgstr "" - -#: src/frame.c:974 -#, c-format -msgid "Paragraph is not text.\n" -msgstr "" - -#: src/frame.c:981 -#, c-format -msgid "Couldn't find run!\n" -msgstr "" - -#: src/frame.c:996 src/frame.c:1696 -#, c-format -msgid "Couldn't find run to insert into.\n" -msgstr "" - -#: src/frame.c:1001 -#, c-format -msgid "No runs in paragraph?\n" -msgstr "" - -#: src/frame.c:1082 -#, c-format -msgid "deleting run %i of %i from para %p\n" -msgstr "" - -#: src/frame.c:1168 -#, c-format -msgid "Couldn't find paragraph %p\n" -msgstr "" - -#: src/frame.c:1190 -#, c-format -msgid "Couldn't find paragraph to delete (%p)\n" -msgstr "" - -#: src/frame.c:1194 -#, c-format -msgid "deleting paragraph %i (%p)\n" -msgstr "" - -#: src/frame.c:1221 -#, c-format -msgid "Couldn't find block %p between paragraphs %p and %p\n" -msgstr "" - -#: src/frame.c:1243 -#, c-format -msgid "Failed to allocate merged runs.\n" -msgstr "" - -#: src/frame.c:1286 -#, c-format -msgid "Failed to merge paragraphs\n" -msgstr "" - -#: src/frame.c:1302 -#, c-format -msgid "Couldn't find paragraphs to merge by newpara\n" -msgstr "" - -#: src/frame.c:1362 -#, c-format -msgid "Delete outside editable region\n" -msgstr "" - -#: src/frame.c:1504 -#, c-format -msgid "Paragraph %p\n" -msgstr "" - -#: src/frame.c:1508 -#, c-format -msgid "%i runs:\n" -msgstr "" - -#: src/frame.c:1510 -#, c-format -msgid " Run %2i: SCBlock %p %s '%s'\n" -msgstr "" - -#: src/frame.c:1517 -#, c-format -msgid " Image: %s\n" -msgstr "" - -#: src/frame.c:1519 -#, c-format -msgid " Other paragraph type\n" -msgstr "" - -#: src/frame.c:1537 src/sc_editor.c:999 -#, c-format -msgid "Failed to insert paragraph\n" +#: src/narrative_window.c:148 +msgid "Failed to save presentation" msgstr "" -#: src/imagestore.c:216 -#, c-format -msgid "Couldn't allocate memory.\n" -msgstr "" +#: src/narrative_window.c:176 +#, fuzzy +msgid "Save presentation" +msgstr "Erzählungsbasiertes Präsentationssystem" -#: src/imagestore.c:330 -#, c-format -msgid "Store %p contains %i records.\n" +#: src/narrative_window.c:180 data/menus.ui:24 +msgid "_Save" msgstr "" -#: src/imagestore.c:334 -#, c-format -msgid "%s :\n" +#: src/narrative_window.c:188 +msgid "Create/update private stylesheet for this presentation" msgstr "" -#: src/narrative_window.c:117 -msgid "Failed to save presentation" +#: src/narrative_window.c:191 +msgid "Create/update default stylesheet for presentations in folder" msgstr "" -#: src/narrative_window.c:186 -#, c-format -msgid "Not a slide!\n" +#: src/narrative_window.c:194 +msgid "Don't save stylesheet at all" msgstr "" -#: src/narrative_window.c:220 +#: src/narrative_window.c:267 #, c-format -msgid "Failed to load\n" +msgid "Failed to load stylesheet\n" msgstr "" -#: src/narrative_window.c:265 +#: src/narrative_window.c:319 msgid "Load stylesheet" msgstr "" -#: src/narrative_window.c:298 -#, c-format -msgid "Failed to split paragraph\n" -msgstr "" - -#: src/narrative_window.c:431 +#: src/narrative_window.c:485 msgid "Export PDF" msgstr "" -#: src/narrative_window.c:435 +#: src/narrative_window.c:489 msgid "_Export" msgstr "" -#: src/narrative_window.c:730 -#, c-format -msgid "Narrative window is already open!\n" +#: src/narrative_window.c:709 +msgid "Too many open slide windows" msgstr "" -#: src/narrative_window.c:777 data/menus.ui:135 +#: src/narrative_window.c:850 data/menus.ui:135 msgid "Start slideshow" msgstr "" -#: src/narrative_window.c:788 +#: src/narrative_window.c:861 msgid "Add slide" msgstr "" -#: src/narrative_window.c:798 +#: src/narrative_window.c:871 msgid "First slide" msgstr "" -#: src/narrative_window.c:805 +#: src/narrative_window.c:878 msgid "Previous slide" msgstr "" -#: src/narrative_window.c:812 +#: src/narrative_window.c:885 msgid "Next slide" msgstr "" -#: src/narrative_window.c:819 +#: src/narrative_window.c:892 msgid "Last slide" msgstr "" @@ -429,11 +153,6 @@ msgstr "" msgid "Timer is NOT running!" msgstr "" -#: src/pr_clock.c:285 -#, c-format -msgid "Invalid time '%s'\n" -msgstr "" - #: src/pr_clock.c:329 src/pr_clock.c:380 msgid "Start" msgstr "" @@ -478,41 +197,41 @@ msgstr "" msgid "Presentation clock" msgstr "" -#: src/presentation.c:60 +#: src/presentation.c:55 msgid "(untitled)" msgstr "" -#: src/presentation.c:159 +#: src/presentation.c:155 src/stylesheet.c:253 src/stylesheet.c:263 #, c-format msgid "Open failed: %s\n" msgstr "" -#: src/presentation.c:219 +#: src/presentation.c:160 #, c-format -msgid "Couldn't find first slide!\n" +msgid "Couldn't save presentation\n" msgstr "" -#: src/presentation.c:237 +#: src/presentation.c:166 #, c-format -msgid "Couldn't find last slide!\n" +msgid "Saving stylesheet to %s\n" msgstr "" -#: src/presentation.c:258 +#: src/presentation.c:170 #, c-format -msgid "Couldn't find next slide!\n" +msgid "Couldn't save stylesheet\n" msgstr "" -#: src/presentation.c:279 +#: src/presentation.c:180 #, c-format -msgid "Couldn't find prev slide!\n" +msgid "Not saving the stylesheet\n" msgstr "" -#: src/presentation.c:307 +#: src/presentation.c:331 #, c-format msgid "Failed to load '%s'\n" msgstr "" -#: src/presentation.c:320 +#: src/presentation.c:344 #, c-format msgid "Parse error.\n" msgstr "" @@ -525,222 +244,61 @@ msgstr "" msgid "Print the narrative" msgstr "" -#: src/render.c:194 -#, c-format -msgid "Failed to set up interpreter.\n" -msgstr "" - -#: src/render.c:290 +#: src/render.c:289 #, c-format msgid "Couldn't create Cairo surface\n" msgstr "" -#: src/sc_editor.c:73 -#, c-format -msgid "Paragraphs in current frame:\n" -msgstr "" - #: src/sc_editor.c:479 #, c-format msgid "No frame selected for paste\n" msgstr "" -#. FIXME: Implement this -#: src/sc_editor.c:924 -#, c-format -msgid "Deleting non-text paragraph\n" -msgstr "" - -#: src/sc_editor.c:965 -#, c-format -msgid "Position not editable\n" -msgstr "" - -#: src/sc_editor.c:986 -#, c-format -msgid "No SCBlock for para\n" -msgstr "" - -#: src/sc_editor.c:993 -#, c-format -msgid "Failed to add SCBlock\n" -msgstr "" - -#: src/sc_editor.c:1579 -#, c-format -msgid "Release on pointless drag.\n" -msgstr "" - #: src/sc_editor.c:1594 #, c-format msgid "Failed to create frame!\n" msgstr "" -#: src/sc_editor.c:1703 -#, c-format -msgid "Cursor frame block = %p\n" -msgstr "" - -#: src/sc_editor.c:1704 src/sc_editor.c:1712 -#, c-format -msgid "Editor top block = %p\n" -msgstr "" - -#: src/sc_editor.c:1711 -#, c-format -msgid "Debugging the top frame:\n" -msgstr "" - -#: src/sc_editor.c:1916 -#, c-format -msgid "Failed to allocate SC\n" -msgstr "" - -#: src/sc_editor.c:2104 -#, c-format -msgid "WARNING: Changing imagestore\n" -msgstr "" - -#: src/sc_editor.c:2148 +#: src/sc_editor.c:2146 #, c-format msgid "Failed to load background: %s\n" msgstr "" -#: src/sc_interp.c:175 -#, c-format -msgid "Failed to grow callback list\n" -msgstr "" - -#: src/sc_interp.c:200 -#, c-format -msgid "WARNING: Interpreter already has a callback list.\n" -msgstr "" - -#: src/sc_interp.c:295 -#, c-format -msgid "Couldn't load font '%s' (font map %p, pc %p)\n" -msgstr "" - -#: src/sc_interp.c:316 -#, c-format -msgid "Couldn't describe font.\n" -msgstr "" - -#: src/sc_interp.c:350 +#: src/sc_interp.c:362 #, c-format msgid "Invalid font size '%s'\n" msgstr "" -#: src/sc_interp.c:401 src/sc_interp.c:444 +#: src/sc_interp.c:413 src/sc_interp.c:439 src/sc_interp.c:462 #, c-format msgid "Invalid colour\n" msgstr "" -#: src/sc_interp.c:495 -#, c-format -msgid "Failed to add to stack.\n" -msgstr "" - -#: src/sc_interp.c:667 -#, c-format -msgid "Invalid units in '%s'\n" -msgstr "" - -#: src/sc_interp.c:732 -#, c-format -msgid "Invalid dimensions '%s'\n" -msgstr "" - -#: src/sc_interp.c:745 +#: src/sc_interp.c:722 #, c-format msgid "Unrecognised frame option '%s'\n" msgstr "" -#: src/sc_interp.c:802 -#, c-format -msgid "Unterminated filename?\n" -msgstr "" - -#: src/sc_interp.c:811 +#: src/sc_interp.c:788 #, c-format msgid "Unrecognised image option '%s'\n" msgstr "" -#: src/sc_interp.c:984 +#: src/sc_interp.c:958 #, c-format msgid "Failed to add frame.\n" msgstr "" -#: src/sc_interp.c:1026 +#: src/sc_interp.c:1003 #, c-format msgid "Invalid image options '%s'\n" msgstr "" -#: src/sc_parse.c:116 -#, c-format -msgid "Couldn't find previous\n" -msgstr "" - -#: src/sc_parse.c:274 -#, c-format -msgid "Unlinking at top\n" -msgstr "" - -#: src/sc_parse.c:278 -#, c-format -msgid "Couldn't find block parent!\n" -msgstr "" - -#: src/sc_parse.c:405 -#, c-format -msgid "Failed to serialise block\n" -msgstr "" - -#: src/sc_parse.c:410 -#, c-format -msgid "Write failed: %s\n" -msgstr "" - -#: src/sc_parse.c:533 -#, c-format -msgid "Couldn't find end of options '%s'\n" -msgstr "" - -#: src/sc_parse.c:545 -#, c-format -msgid "Couldn't find end of content '%s'\n" -msgstr "" - -#: src/sc_parse.c:643 src/sc_parse.c:661 src/sc_parse.c:686 -#, c-format -msgid "Block add failed.\n" -msgstr "" - -#: src/sc_parse.c:653 +#: src/sc_parse.c:661 #, c-format msgid "Parse error\n" msgstr "" -#: src/sc_parse.c:703 -#, c-format -msgid "sc_block_set_name: NULL block\n" -msgstr "" - -#: src/sc_parse.c:771 -#, c-format -msgid "Deleting text from block \\%s\n" -msgstr "" - -#: src/sc_parse.c:784 -#, c-format -msgid "Invalid delete: %i %i %i\n" -msgstr "" - -#: src/sc_parse.c:806 -#, c-format -msgid "Splitting a block with a child!\n" -msgstr "" - #: src/slideshow.c:216 src/testcard.c:273 #, c-format msgid "Single monitor mode\n" @@ -757,10 +315,10 @@ msgstr "" #: src/stylesheet.c:70 #, c-format -msgid "Invalid bg gradient spec '%s'\n" +msgid "Invalid background gradient '%s'\n" msgstr "" -#: src/stylesheet.c:77 src/stylesheet.c:80 src/stylesheet_editor.c:125 +#: src/stylesheet.c:77 src/stylesheet.c:80 src/stylesheet_editor.c:184 #, c-format msgid "Failed to parse colour: %s\n" msgstr "" @@ -770,27 +328,27 @@ msgstr "" msgid "Failed to load stylesheet '%s'\n" msgstr "" -#: src/stylesheet.c:159 src/stylesheet.c:190 src/stylesheet.c:213 +#: src/stylesheet.c:113 #, c-format -msgid "No stylesheet!\n" +msgid "Failed to load stylesheet: %s\n" msgstr "" -#: src/stylesheet_editor.c:84 +#: src/stylesheet_editor.c:88 #, c-format msgid "Failed to parse quad: %s\n" msgstr "" -#: src/stylesheet_editor.c:102 +#: src/stylesheet_editor.c:123 #, c-format -msgid "Failed to parse double: %s\n" +msgid "Failed to parse dims: %s\n" msgstr "" -#: src/stylesheet_editor.c:288 +#: src/stylesheet_editor.c:140 #, c-format -msgid "Spacing too long\n" +msgid "Failed to parse double: %s\n" msgstr "" -#: src/stylesheet_editor.c:359 +#: src/stylesheet_editor.c:505 #, c-format msgid "Slide size too long\n" msgstr "" @@ -837,6 +395,16 @@ msgstr "" msgid "Invalid tuple '%s'\n" msgstr "" +#: src/utils.c:92 +#, c-format +msgid "Invalid units in '%s'\n" +msgstr "" + +#: src/utils.c:135 +#, c-format +msgid "Invalid dimensions '%s'\n" +msgstr "" + #: data/menus.ui:9 msgid "File" msgstr "" @@ -849,10 +417,6 @@ msgstr "" msgid "_Open..." msgstr "" -#: data/menus.ui:24 -msgid "_Save" -msgstr "" - #: data/menus.ui:29 msgid "Save As..." msgstr "" @@ -929,7 +493,7 @@ msgstr "" msgid "Slide" msgstr "" -#: data/menus.ui:125 +#: data/menus.ui:125 data/stylesheeteditor.ui:1377 msgid "Slide title" msgstr "" @@ -965,102 +529,175 @@ msgstr "" msgid "_About" msgstr "" -#: data/stylesheeteditor.ui:97 +#: data/stylesheeteditor.ui:157 msgid "Stylesheet editor" msgstr "" -#: data/stylesheeteditor.ui:167 +#: data/stylesheeteditor.ui:227 msgid "This style will be used in the narrative editor" msgstr "" -#: data/stylesheeteditor.ui:185 data/stylesheeteditor.ui:801 +#: data/stylesheeteditor.ui:245 data/stylesheeteditor.ui:905 +#: data/stylesheeteditor.ui:1579 msgid "Text:" msgstr "" -#: data/stylesheeteditor.ui:239 data/stylesheeteditor.ui:692 -#: data/stylesheeteditor.ui:855 +#: data/stylesheeteditor.ui:299 data/stylesheeteditor.ui:796 +#: data/stylesheeteditor.ui:959 data/stylesheeteditor.ui:1633 msgid "Background:" msgstr "" -#: data/stylesheeteditor.ui:252 data/stylesheeteditor.ui:705 -#: data/stylesheeteditor.ui:868 +#: data/stylesheeteditor.ui:312 data/stylesheeteditor.ui:809 +#: data/stylesheeteditor.ui:972 data/stylesheeteditor.ui:1646 msgid "Flat colour" msgstr "" -#: data/stylesheeteditor.ui:253 data/stylesheeteditor.ui:706 -#: data/stylesheeteditor.ui:869 +#: data/stylesheeteditor.ui:313 data/stylesheeteditor.ui:810 +#: data/stylesheeteditor.ui:973 data/stylesheeteditor.ui:1647 msgid "Horizontal gradient" msgstr "" -#: data/stylesheeteditor.ui:254 data/stylesheeteditor.ui:707 -#: data/stylesheeteditor.ui:870 +#: data/stylesheeteditor.ui:314 data/stylesheeteditor.ui:811 +#: data/stylesheeteditor.ui:974 data/stylesheeteditor.ui:1648 msgid "Vertical gradient" msgstr "" -#: data/stylesheeteditor.ui:324 data/stylesheeteditor.ui:463 -#: data/stylesheeteditor.ui:940 data/stylesheeteditor.ui:1079 +#: data/stylesheeteditor.ui:369 data/stylesheeteditor.ui:1029 +#: data/stylesheeteditor.ui:1703 +msgid "Alignment:" +msgstr "" + +#: data/stylesheeteditor.ui:384 data/stylesheeteditor.ui:1044 +#: data/stylesheeteditor.ui:1718 +msgid "Left" +msgstr "" + +#: data/stylesheeteditor.ui:385 data/stylesheeteditor.ui:1045 +#: data/stylesheeteditor.ui:1719 +msgid "Center" +msgstr "" + +#: data/stylesheeteditor.ui:386 data/stylesheeteditor.ui:1046 +#: data/stylesheeteditor.ui:1720 +msgid "Right" +msgstr "" + +#: data/stylesheeteditor.ui:428 data/stylesheeteditor.ui:567 +#: data/stylesheeteditor.ui:1088 data/stylesheeteditor.ui:1227 +#: data/stylesheeteditor.ui:1762 data/stylesheeteditor.ui:1900 msgid "Left:" msgstr "" -#: data/stylesheeteditor.ui:337 data/stylesheeteditor.ui:476 -#: data/stylesheeteditor.ui:953 data/stylesheeteditor.ui:1092 +#: data/stylesheeteditor.ui:441 data/stylesheeteditor.ui:580 +#: data/stylesheeteditor.ui:1101 data/stylesheeteditor.ui:1240 +#: data/stylesheeteditor.ui:1775 data/stylesheeteditor.ui:1913 msgid "Right:" msgstr "" -#: data/stylesheeteditor.ui:350 data/stylesheeteditor.ui:489 -#: data/stylesheeteditor.ui:966 data/stylesheeteditor.ui:1105 +#: data/stylesheeteditor.ui:454 data/stylesheeteditor.ui:593 +#: data/stylesheeteditor.ui:1114 data/stylesheeteditor.ui:1253 +#: data/stylesheeteditor.ui:1788 data/stylesheeteditor.ui:1926 msgid "Top:" msgstr "" -#: data/stylesheeteditor.ui:363 data/stylesheeteditor.ui:502 -#: data/stylesheeteditor.ui:979 data/stylesheeteditor.ui:1118 +#: data/stylesheeteditor.ui:467 data/stylesheeteditor.ui:606 +#: data/stylesheeteditor.ui:1127 data/stylesheeteditor.ui:1266 +#: data/stylesheeteditor.ui:1801 data/stylesheeteditor.ui:1939 msgid "Bottom:" msgstr "" -#: data/stylesheeteditor.ui:428 data/stylesheeteditor.ui:1044 +#: data/stylesheeteditor.ui:532 data/stylesheeteditor.ui:1192 +#: data/stylesheeteditor.ui:2006 msgid "Paragraph spacing" msgstr "" -#: data/stylesheeteditor.ui:567 data/stylesheeteditor.ui:1183 +#: data/stylesheeteditor.ui:671 data/stylesheeteditor.ui:1331 +#: data/stylesheeteditor.ui:1870 msgid "Padding" msgstr "" -#: data/stylesheeteditor.ui:584 +#: data/stylesheeteditor.ui:688 msgid "Narrative" msgstr "" -#: data/stylesheeteditor.ui:611 +#: data/stylesheeteditor.ui:715 msgid "Slide width:" msgstr "" -#: data/stylesheeteditor.ui:639 +#: data/stylesheeteditor.ui:743 msgid "Slide height:" msgstr "" -#: data/stylesheeteditor.ui:667 +#: data/stylesheeteditor.ui:771 msgid "(arbitrary units)" msgstr "" -#: data/stylesheeteditor.ui:762 +#: data/stylesheeteditor.ui:866 msgid "Slides" msgstr "" -#: data/stylesheeteditor.ui:783 +#: data/stylesheeteditor.ui:887 msgid "This refers to the boxes you create within slides" msgstr "" -#: data/stylesheeteditor.ui:1203 +#: data/stylesheeteditor.ui:1351 msgid "Frames" msgstr "" -#: data/savepresentation.ui:78 -msgid "Create/update private stylesheet for this presentation" +#: data/stylesheeteditor.ui:1375 +msgid "Presentation title" msgstr "" -#: data/savepresentation.ui:93 -msgid "Create/update default stylesheet for presentations in folder" +#: data/stylesheeteditor.ui:1376 +msgid "Presentation author" msgstr "" -#: data/savepresentation.ui:109 -msgid "Don't save stylesheet at all" +#: data/stylesheeteditor.ui:1378 +msgid "Slide footer" +msgstr "" + +#: data/stylesheeteditor.ui:1379 +msgid "Slide credit" +msgstr "" + +#: data/stylesheeteditor.ui:1412 +msgid "Width:" +msgstr "" + +#: data/stylesheeteditor.ui:1425 +msgid "Height:" +msgstr "" + +#: data/stylesheeteditor.ui:1438 +msgid "Corner x:" +msgstr "" + +#: data/stylesheeteditor.ui:1451 +msgid "Corner y:" +msgstr "" + +#: data/stylesheeteditor.ui:1464 data/stylesheeteditor.ui:1477 +#: data/stylesheeteditor.ui:1490 data/stylesheeteditor.ui:1503 +#: data/stylesheeteditor.ui:1814 data/stylesheeteditor.ui:1827 +#: data/stylesheeteditor.ui:1840 data/stylesheeteditor.ui:1853 +#: data/stylesheeteditor.ui:1952 data/stylesheeteditor.ui:1965 +#: data/stylesheeteditor.ui:1978 data/stylesheeteditor.ui:1991 +msgid "0" +msgstr "" + +#: data/stylesheeteditor.ui:1519 data/stylesheeteditor.ui:1535 +#, c-format +msgid "% slide" +msgstr "" + +#: data/stylesheeteditor.ui:1520 data/stylesheeteditor.ui:1536 +msgid "units" +msgstr "" + +#: data/stylesheeteditor.ui:1559 +msgid "Geometry" +msgstr "" + +#: data/stylesheeteditor.ui:2025 +msgid "Slide furniture" msgstr "" diff --git a/src/colloquium.c b/src/colloquium.c index a8da4d9..02ffa0a 100644 --- a/src/colloquium.c +++ b/src/colloquium.c @@ -145,7 +145,7 @@ static GFile **gslist_to_array(GSList *item, int *n) while ( item != NULL ) { if ( i == len ) { - fprintf(stderr, _("WTF? Too many files\n")); + fprintf(stderr, "WTF? Too many files\n"); break; } files[i++] = item->data; @@ -169,7 +169,7 @@ static gint open_response_sig(GtkWidget *d, gint response, GApplication *papp) files = gtk_file_chooser_get_files(GTK_FILE_CHOOSER(d)); files_array = gslist_to_array(files, &n_files); if ( files_array == NULL ) { - fprintf(stderr, _("Failed to convert file list\n")); + fprintf(stderr, "Failed to convert file list\n"); return 0; } g_slist_free(files); @@ -274,7 +274,7 @@ static int yesno(const char *a) if ( strcasecmp(a, "no") == 0 ) return 0; if ( strcasecmp(a, "false") == 0 ) return 0; - fprintf(stderr, _("Don't understand '%s', assuming false\n"), a); + fprintf(stderr, "Don't understand '%s', assuming false\n", a); return 0; } @@ -341,7 +341,6 @@ static void colloquium_startup(GApplication *papp) * desktop environment. All the entries are already in the * normal menus, so don't let GTK create a fallback menu in the * menu bar. */ - printf(_("Using app menu\n")); GMenuModel *mmodel = G_MENU_MODEL(gtk_builder_get_object(app->builder, "app-menu")); gtk_application_set_app_menu(GTK_APPLICATION(app), mmodel); } diff --git a/src/debugger.c b/src/debugger.c index 12ef9d8..f15478a 100644 --- a/src/debugger.c +++ b/src/debugger.c @@ -86,13 +86,13 @@ static const char *str_type(enum para_type t) switch ( t ) { /* Text paragraph */ - case PARA_TYPE_TEXT : return _("text"); + case PARA_TYPE_TEXT : return "text"; /* Callback paragraph */ - case PARA_TYPE_CALLBACK : return _("callback"); + case PARA_TYPE_CALLBACK : return "callback"; /* Unknown paragraph type */ - default : return _("unknown"); + default : return "unknown"; } } @@ -104,14 +104,14 @@ static void debug_text_para(Paragraph *para, cairo_t *cr, double *ypos, nrun = para_debug_num_runs(para); /* How many text runs */ - snprintf(tmp, 255, _(" %i runs"), nrun); + snprintf(tmp, 255, " %i runs", nrun); plot_text(cr, ypos, fontdesc, tmp); for ( i=0; ichildren = NULL; n->max_children = 32; if ( alloc_ro(n) ) { - fprintf(stderr, _("Couldn't allocate children\n")); + fprintf(stderr, "Couldn't allocate children\n"); free(n); return NULL; } @@ -188,7 +188,7 @@ void show_frame_hierarchy(struct frame *fr, const char *t) strcpy(tn, t); strcat(tn, " "); - printf(_("%s%p (%.2f x %.2f)\n"), t, fr, fr->w, fr->h); + printf("%s%p (%.2f x %.2f)\n", t, fr, fr->w, fr->h); for ( i=0; inum_children; i++ ) { show_frame_hierarchy(fr->children[i], tn); @@ -216,12 +216,12 @@ struct frame *find_frame_with_scblocks(struct frame *fr, SCBlock *scblocks) static const char *text_for_run(const struct text_run *run) { if ( run == NULL ) { - fprintf(stderr, _("NULL run passed to text_for_run\n")); + fprintf(stderr, "NULL run passed to text_for_run\n"); return 0; } if ( run->scblock == NULL ) { - fprintf(stderr, _("NULL scblock in text_for_run\n")); + fprintf(stderr, "NULL scblock in text_for_run\n"); return 0; } @@ -236,12 +236,12 @@ static const char *text_for_run(const struct text_run *run) static size_t run_text_len(const struct text_run *run) { if ( run == NULL ) { - fprintf(stderr, _("NULL run passed to run_text_len\n")); + fprintf(stderr, "NULL run passed to run_text_len\n"); return 0; } if ( run->scblock == NULL ) { - fprintf(stderr, _("NULL scblock in run_text_len\n")); + fprintf(stderr, "NULL scblock in run_text_len\n"); return 0; } @@ -250,7 +250,7 @@ static size_t run_text_len(const struct text_run *run) } if ( sc_block_contents(run->scblock) == NULL ) { - fprintf(stderr, _("NULL scblock contents in run_text_len\n")); + fprintf(stderr, "NULL scblock contents in run_text_len\n"); return 0; } @@ -288,7 +288,7 @@ void wrap_paragraph(Paragraph *para, PangoContext *pc, double w, /* Allocate the complete text */ text = malloc(total_len+1); if ( text == NULL ) { - fprintf(stderr, _("Couldn't allocate combined text (%lli)\n"), + fprintf(stderr, "Couldn't allocate combined text (%lli)\n", (long long int)total_len); return; } @@ -375,7 +375,7 @@ void add_run(Paragraph *para, SCBlock *scblock, runs_new = realloc(para->runs, (para->n_runs+1)*sizeof(struct text_run)); if ( runs_new == NULL ) { - fprintf(stderr, _("Failed to add run.\n")); + fprintf(stderr, "Failed to add run.\n"); return; } @@ -433,7 +433,7 @@ Paragraph *insert_paragraph(struct frame *fr, int pos) int i; if ( pos >= fr->n_paras ) { - fprintf(stderr, _("insert_paragraph(): pos too high!\n")); + fprintf(stderr, "insert_paragraph(): pos too high!\n"); return NULL; } @@ -467,7 +467,7 @@ Paragraph *add_callback_para(struct frame *fr, SCBlock *bl, double w, double h, } else { pnew = create_paragraph(fr, bl); if ( pnew == NULL ) { - fprintf(stderr, _("Failed to add callback paragraph\n")); + fprintf(stderr, "Failed to add callback paragraph\n"); return NULL; } } @@ -495,7 +495,7 @@ void add_image_para(struct frame *fr, SCBlock *scblock, int wi, hi; if ( is == NULL ) { - fprintf(stderr, _("Adding image without ImageStore!\n")); + fprintf(stderr, "Adding image without ImageStore!\n"); return; } @@ -504,13 +504,14 @@ void add_image_para(struct frame *fr, SCBlock *scblock, } else { pnew = create_paragraph(fr, scblock); if ( pnew == NULL ) { - fprintf(stderr, _("Failed to add image paragraph\n")); + fprintf(stderr, "Failed to add image paragraph\n"); return; } } if ( imagestore_get_size(is, filename, &wi, &hi) ) { - fprintf(stderr, _("Couldn't get size for %s\n"), filename); + fprintf(stderr, _("Couldn't determine size of image '%s'\n"), + filename); wi = 100; hi = 100; } @@ -612,7 +613,7 @@ void render_paragraph(cairo_t *cr, Paragraph *para, ImageStore *is) if ( surf != NULL ) { render_from_surf(surf, cr, para->image_w, para->image_h, 0); } else { - printf(_("surf = NULL!\n")); + printf("surf = NULL!\n"); } break; @@ -656,7 +657,7 @@ static size_t text_para_pos(Paragraph *para, double x, double y, int *ptrail) void show_edit_pos(struct edit_pos a) { - printf(_("para %i, pos %li, trail %i\n"), a.para, (long int)a.pos, a.trail); + printf("para %i, pos %li, trail %i\n", a.para, (long int)a.pos, a.trail); } @@ -701,7 +702,7 @@ void ensure_run(struct frame *fr, struct edit_pos cpos) bl = sc_block_prepend(para->scblock, fr->scblocks); if ( bl == NULL ) { - fprintf(stderr, _("Couldn't prepend block\n")); + fprintf(stderr, "Couldn't prepend block\n"); return; } sc_block_set_contents(bl, strdup("")); @@ -727,7 +728,7 @@ int find_cursor(struct frame *fr, double x, double y, struct edit_pos *pos) int i; if ( fr == NULL ) { - fprintf(stderr, _("Cursor frame is NULL.\n")); + fprintf(stderr, "Cursor frame is NULL.\n"); return 1; } @@ -751,7 +752,7 @@ int find_cursor(struct frame *fr, double x, double y, struct edit_pos *pos) } if ( fr->n_paras == 0 ) { - printf(_("No paragraphs in frame.\n")); + printf("No paragraphs in frame.\n"); return 1; } @@ -772,12 +773,12 @@ int get_para_highlight(struct frame *fr, int cursor_para, double py = 0.0; if ( fr == NULL ) { - fprintf(stderr, _("Cursor frame is NULL.\n")); + fprintf(stderr, "Cursor frame is NULL.\n"); return 1; } if ( cursor_para >= fr->n_paras ) { - fprintf(stderr, _("Highlight paragraph number is too high!\n")); + fprintf(stderr, "Highlight paragraph number is too high!\n"); return 1; } @@ -803,12 +804,12 @@ int get_cursor_pos(struct frame *fr, int cursor_para, int cursor_pos, double py = 0.0; if ( fr == NULL ) { - fprintf(stderr, _("Cursor frame is NULL.\n")); + fprintf(stderr, "Cursor frame is NULL.\n"); return 1; } if ( cursor_para >= fr->n_paras ) { - fprintf(stderr, _("Cursor paragraph number is too high!\n")); + fprintf(stderr, "Cursor paragraph number is too high!\n"); return 1; } @@ -927,7 +928,7 @@ size_t pos_trail_to_offset(Paragraph *para, size_t offs, int trail) nrun = which_run(para, offs); if ( nrun == para->n_runs ) { - fprintf(stderr, _("pos_trail_to_offset: Offset too high\n")); + fprintf(stderr, "pos_trail_to_offset: Offset too high\n"); return 0; } @@ -940,20 +941,20 @@ size_t pos_trail_to_offset(Paragraph *para, size_t offs, int trail) if ( para->type != PARA_TYPE_TEXT ) return 0; if ( run == NULL ) { - fprintf(stderr, _("pos_trail_to_offset: No run\n")); + fprintf(stderr, "pos_trail_to_offset: No run\n"); return 0; } if ( run->scblock == NULL ) { - fprintf(stderr, _("pos_trail_to_offset: SCBlock = NULL?\n")); + fprintf(stderr, "pos_trail_to_offset: SCBlock = NULL?\n"); return 0; } /* Get the text for the run */ run_text = text_for_run(run); if ( run_text == NULL ) { - fprintf(stderr, _("pos_trail_to_offset: No contents " - "(%p name=%s, options=%s)\n"), + fprintf(stderr, "pos_trail_to_offset: No contents " + "(%p name=%s, options=%s)\n", run->scblock, sc_block_name(run->scblock), sc_block_options(run->scblock)); return 0; @@ -968,8 +969,8 @@ size_t pos_trail_to_offset(Paragraph *para, size_t offs, int trail) char_offs += trail; if ( char_offs > g_utf8_strlen(run_text, -1) ) { - printf(_("Offset outside string! '%s'\n" - "char_offs %li offs %li len %li\n"), + printf("Offset outside string! '%s'\n" + "char_offs %li offs %li len %li\n", run_text, (long int)char_offs, (long int)offs, (long int)g_utf8_strlen(run_text, -1)); } @@ -986,26 +987,26 @@ int position_editable(struct frame *fr, struct edit_pos cp) size_t paraoffs; if ( fr == NULL ) { - fprintf(stderr, _("Frame is NULL.\n")); + fprintf(stderr, "Frame is NULL.\n"); return 0; } if ( cp.para >= fr->n_paras ) { - fprintf(stderr, _("Paragraph number is too high!\n")); + fprintf(stderr, "Paragraph number is too high!\n"); return 0; } para = fr->paras[cp.para]; if ( para->type != PARA_TYPE_TEXT ) { - fprintf(stderr, _("Paragraph is not text.\n")); + fprintf(stderr, "Paragraph is not text.\n"); return 0; } paraoffs = pos_trail_to_offset(para, cp.pos, cp.trail); run = which_run(para, paraoffs); if ( run == para->n_runs ) { - fprintf(stderr, _("Couldn't find run!\n")); + fprintf(stderr, "Couldn't find run!\n"); return 0; } @@ -1022,12 +1023,12 @@ void insert_text_in_paragraph(Paragraph *para, size_t offs, const char *t) /* Find which run we are in */ nrun = which_run(para, offs); if ( nrun == para->n_runs ) { - fprintf(stderr, _("Couldn't find run to insert into.\n")); + fprintf(stderr, "Couldn't find run to insert into.\n"); return; } if ( para->n_runs == 0 ) { - printf(_("No runs in paragraph?\n")); + printf("No runs in paragraph?\n"); } else { struct text_run *run; size_t run_offs; @@ -1108,7 +1109,7 @@ static int pos_to_run_number(struct frame *fr, struct edit_pos p) static void delete_run(Paragraph *para, int nrun) { - printf(_("deleting run %i of %i from para %p\n"), nrun, para->n_runs, para); + printf("deleting run %i of %i from para %p\n", nrun, para->n_runs, para); memmove(¶->runs[nrun], ¶->runs[nrun+1], (para->n_runs-nrun-1)*sizeof(struct text_run)); para->n_runs--; @@ -1194,7 +1195,7 @@ static int paragraph_number(struct frame *fr, Paragraph *p, int *err) for ( i=0; in_paras; i++ ) { if ( fr->paras[i] == p ) return i; } - fprintf(stderr, _("Couldn't find paragraph %p\n"), p); + fprintf(stderr, "Couldn't find paragraph %p\n", p); *err = 1; return 0; } @@ -1216,11 +1217,11 @@ static void delete_paragraph(struct frame *fr, Paragraph *para, int *pnp) { int pn = find_para(fr, para); if ( pn == fr->n_paras ) { - fprintf(stderr, _("Couldn't find paragraph to delete (%p)\n"), para); + fprintf(stderr, "Couldn't find paragraph to delete (%p)\n", para); return; } - printf(_("deleting paragraph %i (%p)\n"), pn, para); + printf("deleting paragraph %i (%p)\n", pn, para); memmove(&fr->paras[pn], &fr->paras[pn+1], (fr->n_paras-pn-1)*sizeof(Paragraph *)); @@ -1247,7 +1248,7 @@ static void delete_run_for_scblock(struct frame *fr, para = find_run_for_scblock(fr, pn1, pn2, bl, &run); if ( para == NULL ) { - fprintf(stderr, _("Couldn't find block %p between paragraphs %p and %p\n"), + fprintf(stderr, "Couldn't find block %p between paragraphs %p and %p\n", bl, p1, p2); return; } @@ -1269,7 +1270,7 @@ static signed int merge_paragraph_runs(Paragraph *p1, Paragraph *p2) runs_new = realloc(p1->runs, (p1->n_runs+p2->n_runs)*sizeof(struct text_run)); if ( runs_new == NULL ) { - fprintf(stderr, _("Failed to allocate merged runs.\n")); + fprintf(stderr, "Failed to allocate merged runs.\n"); return -1; } p1->runs = runs_new; @@ -1312,7 +1313,7 @@ static void merge_paragraphs_by_newpara(struct frame *fr, SCBlock *np) show_para(p2); spos = merge_paragraph_runs(p1, p2); if ( spos < 0 ) { - fprintf(stderr, _("Failed to merge paragraphs\n")); + fprintf(stderr, "Failed to merge paragraphs\n"); return; } printf("-------------------------------\n"); @@ -1328,7 +1329,7 @@ static void merge_paragraphs_by_newpara(struct frame *fr, SCBlock *np) } } - fprintf(stderr, _("Couldn't find paragraphs to merge by newpara\n")); + fprintf(stderr, "Couldn't find paragraphs to merge by newpara\n"); } @@ -1388,7 +1389,7 @@ void delete_text_from_frame(struct frame *fr, struct edit_pos p1, struct edit_po } if ( !position_editable(fr, p1) || !position_editable(fr, p2) ) { - fprintf(stderr, _("Delete outside editable region\n")); + fprintf(stderr, "Delete outside editable region\n"); return; } @@ -1529,24 +1530,24 @@ void delete_text_from_frame(struct frame *fr, struct edit_pos p1, struct edit_po void show_para(Paragraph *p) { - printf(_("Paragraph %p\n"), p); + printf("Paragraph %p\n", p); if ( p->type == PARA_TYPE_TEXT ) { int i; - printf(_("%i runs:\n"), p->n_runs); + printf("%i runs:\n", p->n_runs); for ( i=0; in_runs; i++ ) { - printf(_(" Run %2i: SCBlock %p %s '%s'\n"), + printf(" Run %2i: SCBlock %p %s '%s'\n", i, p->runs[i].scblock, pango_font_description_to_string(p->runs[i].fontdesc), sc_block_contents(p->runs[i].scblock)); } } else if ( p->type == PARA_TYPE_IMAGE ) { - printf(_(" Image: %s\n"), p->filename); + printf(" Image: %s\n", p->filename); } else { - printf(_(" Other paragraph type\n")); + printf(" Other paragraph type\n"); } } @@ -1564,7 +1565,7 @@ static SCBlock *split_text_paragraph(struct frame *fr, int pn, size_t pos, pnew = insert_paragraph(fr, pn); if ( pnew == NULL ) { - fprintf(stderr, _("Failed to insert paragraph\n")); + fprintf(stderr, "Failed to insert paragraph\n"); return NULL; } @@ -1723,7 +1724,7 @@ int get_sc_pos(struct frame *fr, int pn, size_t pos, nrun = which_run(para, pos); if ( nrun == para->n_runs ) { - fprintf(stderr, _("Couldn't find run to insert into.\n")); + fprintf(stderr, "Couldn't find run to insert into.\n"); return 1; } run = ¶->runs[nrun]; diff --git a/src/imagestore.c b/src/imagestore.c index b6297b7..61ebcfb 100644 --- a/src/imagestore.c +++ b/src/imagestore.c @@ -213,7 +213,8 @@ static struct image_record *add_image_record(ImageStore *is, if ( is->n_images == is->max_images ) { if ( alloc_images(is, is->max_images+32) ) { - fprintf(stderr, _("Couldn't allocate memory.\n")); + fprintf(stderr, "Couldn't allocate memory for image " + "records.\n"); return NULL; } } @@ -327,11 +328,11 @@ void show_imagestore(ImageStore *is) { int i; - printf(_("Store %p contains %i records.\n"), is, is->n_images); + printf("Store %p contains %i records.\n", is, is->n_images); for ( i=0; in_images; i++ ) { - printf(_("%s :\n"), is->images[i].filename); + printf("%s :\n", is->images[i].filename); printf("\n"); } diff --git a/src/narrative_window.c b/src/narrative_window.c index 246dc1a..e0c59ef 100644 --- a/src/narrative_window.c +++ b/src/narrative_window.c @@ -141,7 +141,7 @@ static gint saveas_response_sig(GtkWidget *d, gint response, } else if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(si->noss)) ) { /* Do nothing */ } else { - fprintf(stderr, _("Couldn't determine how to save stylesheet!\n")); + fprintf(stderr, "Couldn't determine where to save stylesheet!\n"); } if ( save_presentation(si->nw->p, file, ssfile) ) { @@ -230,7 +230,7 @@ static void delete_slide_sig(GSimpleAction *action, GVariant *parameter, /* Get the SCBlock corresponding to the slide */ ns = sc_editor_get_cursor_bvp(nw->sceditor); if ( ns == NULL ) { - fprintf(stderr, _("Not a slide!\n")); + fprintf(stderr, "Not a slide!\n"); return; } @@ -264,7 +264,7 @@ static gint load_ss_response_sig(GtkWidget *d, gint response, sc_editor_set_scblock(nw->sceditor, nw->dummy_top); } else { - fprintf(stderr, _("Failed to load\n")); + fprintf(stderr, _("Failed to load stylesheet\n")); } g_object_unref(file); @@ -349,7 +349,7 @@ static void add_slide_sig(GSimpleAction *action, GVariant *parameter, if ( nsblock != NULL ) { sc_block_append_p(nsblock, templ); } else { - fprintf(stderr, _("Failed to split paragraph\n")); + fprintf(stderr, "Failed to split paragraph\n"); } sc_editor_set_scblock(nw->sceditor, nw->dummy_top); @@ -801,7 +801,7 @@ NarrativeWindow *narrative_window_new(struct presentation *p, GApplication *papp Colloquium *app = COLLOQUIUM(papp); if ( p->narrative_window != NULL ) { - fprintf(stderr, _("Narrative window is already open!\n")); + fprintf(stderr, "Narrative window is already open!\n"); return NULL; } diff --git a/src/pr_clock.c b/src/pr_clock.c index f9fcbe4..8085c89 100644 --- a/src/pr_clock.c +++ b/src/pr_clock.c @@ -282,7 +282,7 @@ static void set_sig(GtkEditable *w, struct pr_clock *n) t = gtk_entry_get_text(GTK_ENTRY(n->entry)); n->time_allowed = 60.0 * strtod(t, &check); if ( check == t ) { - fprintf(stderr, _("Invalid time '%s'\n"), t); + fprintf(stderr, "Invalid time '%s'\n", t); n->time_allowed = 0.0; } diff --git a/src/presentation.c b/src/presentation.c index ae3f044..d7d9c08 100644 --- a/src/presentation.c +++ b/src/presentation.c @@ -240,7 +240,7 @@ SCBlock *first_slide(struct presentation *p) bl = sc_block_next(bl); } - fprintf(stderr, _("Couldn't find first slide!\n")); + fprintf(stderr, "Couldn't find first slide!\n"); return NULL; } @@ -258,7 +258,7 @@ SCBlock *last_slide(struct presentation *p) } if ( l == NULL ) { - fprintf(stderr, _("Couldn't find last slide!\n")); + fprintf(stderr, "Couldn't find last slide!\n"); } return l; } @@ -279,7 +279,7 @@ SCBlock *next_slide(struct presentation *p, SCBlock *sl) bl = sc_block_next(bl); } - fprintf(stderr, _("Couldn't find next slide!\n")); + fprintf(stderr, "Couldn't find next slide!\n"); return NULL; } @@ -300,7 +300,7 @@ SCBlock *prev_slide(struct presentation *p, SCBlock *sl) bl = sc_block_next(bl); } - fprintf(stderr, _("Couldn't find prev slide!\n")); + fprintf(stderr, "Couldn't find prev slide!\n"); return NULL; } diff --git a/src/render.c b/src/render.c index 3d46e7b..6ac09fc 100644 --- a/src/render.c +++ b/src/render.c @@ -195,7 +195,7 @@ struct frame *interp_and_shape(SCBlock *scblocks, Stylesheet *stylesheet, scin = sc_interp_new(pc, lang, is, top); if ( scin == NULL ) { - fprintf(stderr, _("Failed to set up interpreter.\n")); + fprintf(stderr, "Failed to set up interpreter.\n"); frame_free(top); return NULL; } diff --git a/src/sc_editor.c b/src/sc_editor.c index 47218d9..8e79fd8 100644 --- a/src/sc_editor.c +++ b/src/sc_editor.c @@ -70,7 +70,7 @@ static void debug_paragraphs(SCEditor *e) struct frame *fr = e->cursor_frame; int i; - printf(_("Paragraphs in current frame:\n")); + printf("Paragraphs in current frame:\n"); for ( i=0; in_paras; i++ ) { show_para(fr->paras[i]); } @@ -921,7 +921,7 @@ static void do_backspace(struct frame *fr, SCEditor *e) } else { /* FIXME: Implement this */ - fprintf(stderr, _("Deleting non-text paragraph\n")); + fprintf(stderr, "Deleting non-text paragraph\n"); } @@ -962,7 +962,7 @@ static void insert_text(char *t, SCEditor *e) /* Yes. The "easy" case */ if ( !position_editable(e->cursor_frame, e->cpos) ) { - fprintf(stderr, _("Position not editable\n")); + fprintf(stderr, "Position not editable\n"); return; } @@ -983,20 +983,20 @@ static void insert_text(char *t, SCEditor *e) bd = para_scblock(para); if ( bd == NULL ) { - fprintf(stderr, _("No SCBlock for para\n")); + fprintf(stderr, "No SCBlock for para\n"); return; } /* No. Create a new text paragraph straight afterwards */ ad = sc_block_insert_after(bd, NULL, NULL, strdup(t)); if ( ad == NULL ) { - fprintf(stderr, _("Failed to add SCBlock\n")); + fprintf(stderr, "Failed to add SCBlock\n"); return; } pnew = insert_paragraph(e->cursor_frame, e->cpos.para); if ( pnew == NULL ) { - fprintf(stderr, _("Failed to insert paragraph\n")); + fprintf(stderr, "Failed to insert paragraph\n"); return; } add_run(pnew, ad, e->cursor_frame->fontdesc, @@ -1576,7 +1576,7 @@ static gboolean button_release_sig(GtkWidget *da, GdkEventButton *event, { case DRAG_REASON_NONE : - printf(_("Release on pointless drag.\n")); + printf("Release on pointless drag.\n"); break; case DRAG_REASON_CREATE : @@ -1700,16 +1700,16 @@ static gboolean key_press_sig(GtkWidget *da, GdkEventKey *event, if ( event->state & GDK_CONTROL_MASK ) { debug_paragraphs(e); } else if ( event->state & GDK_SHIFT_MASK ) { - printf(_("Cursor frame block = %p\n"), e->cursor_frame->scblocks); - printf(_("Editor top block = %p\n"), e->scblocks); + printf("Cursor frame block = %p\n", e->cursor_frame->scblocks); + printf("Editor top block = %p\n", e->scblocks); show_sc_block(e->cursor_frame->scblocks, ""); } else { open_debugger(e->cursor_frame); } } else { if ( event->state & GDK_SHIFT_MASK ) { - printf(_("Debugging the top frame:\n")); - printf(_("Editor top block = %p\n"), e->scblocks); + printf("Debugging the top frame:\n"); + printf("Editor top block = %p\n", e->scblocks); show_sc_block(e->top->scblocks, ""); } } @@ -1913,7 +1913,7 @@ static void dnd_receive(GtkWidget *widget, GdkDragContext *drag_context, opts = malloc(len); if ( opts == NULL ) { free(filename); - fprintf(stderr, _("Failed to allocate SC\n")); + fprintf(stderr, "Failed to allocate SC\n"); return; } snprintf(opts, len, "1fx1f+0+0,filename=\"%s\"", @@ -2101,7 +2101,7 @@ void sc_editor_set_scale(SCEditor *e, int scale) void sc_editor_set_imagestore(SCEditor *e, ImageStore *is) { if ( e->is != NULL ) { - fprintf(stderr, _("WARNING: Changing imagestore\n")); + fprintf(stderr, "WARNING: Changing imagestore\n"); } e->is = is; } diff --git a/src/sc_interp.c b/src/sc_interp.c index 86084b0..0d65475 100644 --- a/src/sc_interp.c +++ b/src/sc_interp.c @@ -191,7 +191,7 @@ void sc_callback_list_add_callback(SCCallbackList *cbl, const char *name, if ( (names_new == NULL) || (box_funcs_new == NULL) || (vps_new == NULL) || (draw_funcs_new == NULL) || (click_funcs_new == NULL) ) { - fprintf(stderr, _("Failed to grow callback list\n")); + fprintf(stderr, "Failed to grow callback list\n"); return; } @@ -216,8 +216,8 @@ void sc_callback_list_add_callback(SCCallbackList *cbl, const char *name, void sc_interp_set_callbacks(SCInterpreter *scin, SCCallbackList *cbl) { if ( scin->cbl != NULL ) { - fprintf(stderr, _("WARNING: Interpreter already has a callback " - "list.\n")); + fprintf(stderr, "WARNING: Interpreter already has a callback " + "list.\n"); } scin->cbl = cbl; } @@ -304,7 +304,7 @@ static void update_font(SCInterpreter *scin) scin->pc, st->fontdesc); if ( st->font == NULL ) { char *f = pango_font_description_to_string(st->fontdesc); - fprintf(stderr, _("Couldn't load font '%s' (font map %p, pc %p)\n"), + fprintf(stderr, "Couldn't load font '%s' (font map %p, pc %p)\n", f, pango_context_get_font_map(scin->pc), scin->pc); g_free(f); return; @@ -325,7 +325,7 @@ static void set_font(SCInterpreter *scin, const char *font_name) st->fontdesc = pango_font_description_from_string(font_name); if ( st->fontdesc == NULL ) { - fprintf(stderr, _("Couldn't describe font.\n")); + fprintf(stderr, "Couldn't describe font.\n"); return; } @@ -508,7 +508,7 @@ void sc_interp_save(SCInterpreter *scin) stack_new = realloc(scin->state, sizeof(struct sc_state) * (scin->max_state+8)); if ( stack_new == NULL ) { - fprintf(stderr, _("Failed to add to stack.\n")); + fprintf(stderr, "Failed to add to stack.\n"); return; } @@ -776,7 +776,7 @@ static int parse_image_option(const char *opt, struct frame *parent, char *fn; fn = strdup(opt+10); if ( fn[strlen(fn)-1] != '\"' ) { - fprintf(stderr, _("Unterminated filename?\n")); + fprintf(stderr, "Unterminated filename?\n"); free(fn); return 1; } diff --git a/src/sc_parse.c b/src/sc_parse.c index e1b797a..78f5799 100644 --- a/src/sc_parse.c +++ b/src/sc_parse.c @@ -113,7 +113,7 @@ SCBlock *sc_block_prepend(SCBlock *bl, SCBlock *top) prev = sc_find_previous(top, bl); if ( prev == NULL ) { - fprintf(stderr, _("Couldn't find previous\n")); + fprintf(stderr, "Couldn't find previous\n"); return NULL; } @@ -271,11 +271,11 @@ static int sc_block_unlink(SCBlock **top, SCBlock *deleteme) if ( parent == NULL ) { /* Maybe it's the first block? */ if ( *top == deleteme ) { - fprintf(stderr, _("Unlinking at top\n")); + fprintf(stderr, "Unlinking at top\n"); *top = (*top)->next; return 0; } else { - fprintf(stderr, _("Couldn't find block parent!\n")); + fprintf(stderr, "Couldn't find block parent!\n"); return 1; } } @@ -411,12 +411,12 @@ int save_sc_block(GOutputStream *fh, const SCBlock *bl) char *a = serialise_sc_block(bl); gssize r; if ( a == NULL ) { - fprintf(stderr, _("Failed to serialise block\n")); + fprintf(stderr, "Failed to serialise block\n"); return 1; } r = g_output_stream_write(fh, a, strlen(a), NULL, &error); if ( r == -1 ) { - fprintf(stderr, _("Write failed: %s\n"), error->message); + fprintf(stderr, "Write failed: %s\n", error->message); return 1; } free(a); @@ -539,7 +539,7 @@ static size_t read_block(const char *sc, char **pname, char **options, i += get_subexpr(sc+i+1, "[]", options, err) + 1; if ( *err ) { - printf(_("Couldn't find end of options '%s'\n"), sc+i); + printf("Couldn't find end of options '%s'\n", sc+i); return 0; } @@ -551,7 +551,7 @@ static size_t read_block(const char *sc, char **pname, char **options, i += get_subexpr(sc+i+1, "{}", contents, err) + 1; if ( *err ) { - printf(_("Couldn't find end of content '%s'\n"), sc+i); + printf("Couldn't find end of content '%s'\n", sc+i); return 0; } @@ -648,7 +648,7 @@ SCBlock *sc_parse(const char *sc) bl = sc_block_append(bl, NULL, NULL, strdup(tbuf), &blf); if ( bl == NULL ) { - fprintf(stderr, _("Block add failed.\n")); + fprintf(stderr, "Block add failed.\n"); sc_block_free(blf); free(tbuf); return NULL; @@ -666,7 +666,7 @@ SCBlock *sc_parse(const char *sc) bl = sc_block_append(bl, name, opt, contents, &blf); if ( bl == NULL ) { - fprintf(stderr, _("Block add failed.\n")); + fprintf(stderr, "Block add failed.\n"); sc_block_free(blf); free(tbuf); return NULL; @@ -691,7 +691,7 @@ SCBlock *sc_parse(const char *sc) tbuf[j] = '\0'; bl = sc_block_append(bl, NULL, NULL, tbuf, &blf); if ( bl == NULL ) { - fprintf(stderr, _("Block add failed.\n")); + fprintf(stderr, "Block add failed.\n"); sc_block_free(blf); free(tbuf); return NULL; @@ -708,7 +708,7 @@ SCBlock *sc_parse(const char *sc) void sc_block_set_name(SCBlock *bl, char *nam) { if ( bl == NULL ) { - fprintf(stderr, _("sc_block_set_name: NULL block\n")); + fprintf(stderr, "sc_block_set_name: NULL block\n"); return; } free(bl->name); @@ -788,7 +788,7 @@ size_t scblock_delete_text(SCBlock *b, ssize_t o1, ssize_t o2) size_t len; if ( b->contents == NULL ) { - fprintf(stderr, _("Deleting text from block \\%s\n"), b->name); + fprintf(stderr, "Deleting text from block \\%s\n", b->name); return 0; } @@ -801,7 +801,7 @@ size_t scblock_delete_text(SCBlock *b, ssize_t o1, ssize_t o2) len = strlen(b->contents); if ( o2 < 0 ) o2 = len; if ( (o1 >= o2) || (o1 > len) || (o2 > len) ) { - fprintf(stderr, _("Invalid delete: %i %i %i\n"), + fprintf(stderr, "Invalid delete: %i %i %i\n", (int)o1, (int)o2, (int)len); return 0; } @@ -823,7 +823,7 @@ SCBlock *sc_block_split(SCBlock *bl, size_t pos) SCBlock *n = sc_block_new(); if ( bl->child != NULL ) { - fprintf(stderr, _("Splitting a block with a child!\n")); + fprintf(stderr, "Splitting a block with a child!\n"); return NULL; } diff --git a/src/stylesheet.c b/src/stylesheet.c index 51e8bd4..a6e2531 100644 --- a/src/stylesheet.c +++ b/src/stylesheet.c @@ -67,7 +67,7 @@ int parse_colour_duo(const char *a, GdkRGBA *col1, GdkRGBA *col2) cpos = find_comma(acopy); if ( cpos == 0 ) { - fprintf(stderr, _("Invalid bg gradient spec '%s'\n"), a); + fprintf(stderr, _("Invalid background gradient '%s'\n"), a); return 1; } @@ -110,7 +110,8 @@ Stylesheet *stylesheet_load(GFile *file) r = json_parser_load_from_data(parser, everything, len, &err); if ( r == FALSE ) { - fprintf(stderr, "Failed to load style sheet: '%s'\n", err->message); + fprintf(stderr, _("Failed to load stylesheet: %s\n"), + err->message); free(ss); return NULL; } @@ -195,7 +196,7 @@ int stylesheet_set(Stylesheet *ss, const char *path, const char *key, int r = 1; if ( ss == NULL ) { - fprintf(stderr, _("No stylesheet!\n")); + fprintf(stderr, "No stylesheet!\n"); return 1; } @@ -218,7 +219,7 @@ int stylesheet_delete(Stylesheet *ss, const char *path, const char *key) int r = 1; if ( ss == NULL ) { - fprintf(stderr, _("No stylesheet!\n")); + fprintf(stderr, "No stylesheet!\n"); return 1; } -- cgit v1.2.3